diff --git a/tests/additional_seeds/additional_seeds_suite_test.go b/tests/additional_seeds/additional_seeds_suite_test.go index 92042909..4599e169 100644 --- a/tests/additional_seeds/additional_seeds_suite_test.go +++ b/tests/additional_seeds/additional_seeds_suite_test.go @@ -23,7 +23,7 @@ var ( testName = "Seed Selection" namespace = "test-additional-seeds" dcName = "dc1" - dcYaml = "../testdata/additional-seeds-three-rack-six-node-dc.yaml" + dcYaml = "../testdata/additional-seeds-two-rack-four-node-dc.yaml" dcResource = fmt.Sprintf("CassandraDatacenter/%s", dcName) dcLabel = fmt.Sprintf("cassandra.datastax.com/datacenter=%s", dcName) additionalSeedServiceResource = "services/cluster1-dc1-additional-seed-service" diff --git a/tests/testdata/additional-seeds-three-rack-six-node-dc.yaml b/tests/testdata/additional-seeds-two-rack-four-node-dc.yaml similarity index 64% rename from tests/testdata/additional-seeds-three-rack-six-node-dc.yaml rename to tests/testdata/additional-seeds-two-rack-four-node-dc.yaml index b020bb68..32a69f2b 100644 --- a/tests/testdata/additional-seeds-three-rack-six-node-dc.yaml +++ b/tests/testdata/additional-seeds-two-rack-four-node-dc.yaml @@ -8,7 +8,7 @@ spec: serverVersion: "3.11.10" managementApiAuth: insecure: {} - size: 6 + size: 4 storageConfig: cassandraDataVolumeClaimSpec: storageClassName: standard @@ -20,8 +20,12 @@ spec: racks: - name: r1 - name: r2 - - name: r3 config: jvm-options: initial_heap_size: "512m" max_heap_size: "512m" + additional-jvm-opts: + - "-Ddse.system_distributed_replication_dc_names=dc1" + - "-Ddse.system_distributed_replication_per_dc=1" + - "-Dcassandra.system_distributed_replication_dc_names=dc1" + - "-Dcassandra.system_distributed_replication_per_dc=1" diff --git a/tests/testdata/default-two-rack-four-node-dc.yaml b/tests/testdata/default-two-rack-four-node-dc.yaml index e6a91f29..838bf07e 100644 --- a/tests/testdata/default-two-rack-four-node-dc.yaml +++ b/tests/testdata/default-two-rack-four-node-dc.yaml @@ -22,8 +22,11 @@ spec: - name: r2 config: jvm-options: - initial_heap_size: "768m" - max_heap_size: "768m" + initial_heap_size: "512m" + max_heap_size: "512m" additional-jvm-opts: - "-Ddse.system_distributed_replication_dc_names=dc1" - "-Ddse.system_distributed_replication_per_dc=1" + - "-Dcassandra.system_distributed_replication_dc_names=dc1" + - "-Dcassandra.system_distributed_replication_per_dc=1" + # - "-Dcassandra.ring_delay_ms=0" diff --git a/tests/util/ginkgo/lib.go b/tests/util/ginkgo/lib.go index bee90c32..12cc6866 100644 --- a/tests/util/ginkgo/lib.go +++ b/tests/util/ginkgo/lib.go @@ -45,7 +45,7 @@ func CreateTestFile(dcYaml string) (string, error) { fileInfo, err := os.Stat(dcYaml) if err != nil { - return "", err + return "", err } d, err := os.ReadFile(dcYaml) @@ -57,7 +57,6 @@ func CreateTestFile(dcYaml string) (string, error) { return "", err } - spec := data["spec"].(map[interface{}]interface{}) serverImage := os.Getenv("M_SERVER_IMAGE") if serverImage != "" { @@ -111,7 +110,7 @@ func CreateTestSecretsConfig(configFile string) (string, error) { fileInfo, err := os.Stat(configFile) if err != nil { - return "", err + return "", err } d, err := os.ReadFile(configFile) @@ -119,7 +118,7 @@ func CreateTestSecretsConfig(configFile string) (string, error) { return "", err } - configString := string(d) + configString := string(d) cassandraVersion := os.Getenv("M_SERVER_VERSION") // jvm-options <-> jvm-server-options if strings.HasPrefix(cassandraVersion, "3.") {