fix(gemini): make gemini work without oracle passed

Signed-off-by: Dusan Malusev <[email protected]>

Author: CodeLieutenant

Diff for: sdcm/gemini_thread.py

@@ -18,6 +18,8 @@
 import json
 import time
 
+from sdcm.cluster import BaseCluster, BaseScyllaCluster
+from sdcm.cluster_aws import CassandraAWSCluster, ScyllaAWSCluster
 from sdcm.sct_events import Severity
 from sdcm.utils.common import FileFollowerThread
 from sdcm.sct_events.loaders import GeminiStressEvent, GeminiStressLogEvent
@@ -60,7 +62,7 @@ def run(self):
 class GeminiStressThread(DockerBasedStressThread):  # pylint: disable=too-many-instance-attributes
     DOCKER_IMAGE_PARAM_NAME = "stress_image.gemini"
 
-    def __init__(self, test_cluster, oracle_cluster, loaders, stress_cmd, timeout=None, params=None):  # pylint: disable=too-many-arguments
+    def __init__(self, test_cluster: BaseCluster | BaseScyllaCluster, oracle_cluster: ScyllaAWSCluster | CassandraAWSCluster | None, loaders, stress_cmd: str, timeout=None, params=None):  # pylint: disable=too-many-arguments
         super().__init__(loader_set=loaders, stress_cmd=stress_cmd, timeout=timeout, params=params)
         self.test_cluster = test_cluster
         self.oracle_cluster = oracle_cluster
@@ -106,13 +108,10 @@ def _generate_gemini_command(self):
         seed = self.params.get("gemini_seed") or random.randint(1, 100)
         table_options = self.params.get("gemini_table_options")
         log_statements = self.params.get("gemini_log_cql_statements") or False
-
         test_nodes = ",".join(self.test_cluster.get_node_cql_ips())
-        oracle_nodes = ",".join(self.oracle_cluster.get_node_cql_ips())
 
         cmd = f"gemini \
                 --non-interactive \
-                --oracle-cluster=\"{oracle_nodes}\" \
                 --test-cluster=\"{test_nodes}\" \
                 --seed={seed} \
                 --schema-seed={seed} \
@@ -122,6 +121,10 @@ def _generate_gemini_command(self):
                 --replication-strategy=\"{{'class': 'NetworkTopologyStrategy', 'replication_factor': '3'}}\" \
                 --oracle-replication-strategy=\"{{'class': 'NetworkTopologyStrategy', 'replication_factor': '1'}}\" "
 
+        if self.oracle_cluster is not None:
+            oracle_nodes = ",".join(self.oracle_cluster.get_node_cql_ips())
+            cmd += f'--oracle-cluster="{oracle_nodes}" '
+
         if log_statements:
             cmd += f"--test-statement-log-file=/{self.gemini_test_statements_file} \
                     --oracle-statement-log-file=/{self.gemini_oracle_statements_file} "

Diff for: unit_tests/test_gemini_thread.py

@@ -33,11 +33,22 @@ def get_node_cql_ips(self):
 def test_01_gemini_thread(request, docker_scylla, params):
     loader_set = LocalLoaderSetDummy(params=params)
     test_cluster = DBCluster([docker_scylla])
-    cmd = (
-        "gemini -d --duration 1m --warmup 0s -c 5 -m write --non-interactive --cql-features basic --max-mutation-retries 100 "
-        "--max-mutation-retries-backoff 100ms --replication-strategy \"{'class': 'NetworkTopologyStrategy', 'replication_factor': '1'}\" "
-        "--table-options \"cdc = {'enabled': true, 'ttl': 0}\" --use-server-timestamps"
+
+    cmd = " ".join(
+        [
+            "--duration=1m",
+            "--warmup=0",
+            "--concurrency=5",
+            "--mode=write",
+            "--cql-features=basic",
+            "--max-mutation-retries=100",
+            "--max-mutation-retries-backoff=100ms",
+            "--replication-strategy=\"{'class': 'NetworkTopologyStrategy', 'replication_factor': '1'}\"",
+            "--table-options=\"cdc = {'enabled': true, 'ttl': 0}\"",
+            "--use-server-timestamps=true",
+        ]
     )
+
     gemini_thread = GeminiStressThread(
         loaders=loader_set,
         stress_cmd=cmd,
@@ -56,3 +67,41 @@ def cleanup_thread():
 
     results = gemini_thread.get_gemini_results()
     gemini_thread.verify_gemini_results(results)
+
+
+def test_gemini_thread_without_cluster(request, docker_scylla, params):
+    loader_set = LocalLoaderSetDummy(params=params)
+    test_cluster = DBCluster([docker_scylla])
+    cmd = " ".join(
+        [
+            "--duration=1m",
+            "--warmup=0",
+            "--concurrency=5",
+            "--mode=write",
+            "--cql-features=basic",
+            "--max-mutation-retries=100",
+            "--max-mutation-retries-backoff=100ms",
+            "--replication-strategy=\"{'class': 'NetworkTopologyStrategy', 'replication_factor': '1'}\"",
+            "--table-options=\"cdc = {'enabled': true, 'ttl': 0}\"",
+            "--use-server-timestamps=true",
+        ]
+    )
+
+    gemini_thread = GeminiStressThread(
+        loaders=loader_set,
+        stress_cmd=cmd,
+        test_cluster=test_cluster,
+        oracle_cluster=None,
+        timeout=120,
+        params=params,
+    )
+
+    def cleanup_thread():
+        gemini_thread.kill()
+
+    request.addfinalizer(cleanup_thread)
+
+    gemini_thread.run()
+
+    results = gemini_thread.get_gemini_results()
+    gemini_thread.verify_gemini_results(results)