Revert rack and node increases

emerkle826 · Nov 21, 2022 · b712302 · b712302
1 parent b6639a0
commit b712302
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git 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/...itional-seeds-three-rack-six-node-dc.yaml → ...ditional-seeds-two-rack-four-node-dc.yaml b/...itional-seeds-three-rack-six-node-dc.yaml → ...ditional-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
@@ -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
@@ -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,15 +110,15 @@ func CreateTestSecretsConfig(configFile string) (string, error) {
 
 	fileInfo, err := os.Stat(configFile)
 	if err != nil {
-        return "", err
+		return "", err
 	}
 
 	d, err := os.ReadFile(configFile)
 	if err != nil {
 		return "", err
 	}
 
-    configString := string(d)
+	configString := string(d)
 	cassandraVersion := os.Getenv("M_SERVER_VERSION")
 	// jvm-options <-> jvm-server-options
 	if strings.HasPrefix(cassandraVersion, "3.") {