[COMMIT scylla-cluster-tests master] feature(cql-stress): update to latest version

[Commit Bot]

From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: master

feature(cql-stress): update to latest version

our current version is few months old, and missing some features

* add support for auth with user/password
* fixed integation test to work with it

Fixes: #7582

---
diff --git a/defaults/test_default.yaml b/defaults/test_default.yaml
--- a/defaults/test_default.yaml
+++ b/defaults/test_default.yaml
@@ -216,7 +216,7 @@ stress_image:
kcl: 'scylladb/hydra-loaders:kcl-jdk8-20210526-ShardSyncStrategyType-PERIODIC'
harry: 'scylladb/hydra-loaders:cassandra-harry-jdk11-20220816'
latte: 'scylladb/hydra-loaders:latte-0.25.2-scylladb'
- cql-stress-cassandra-stress: 'scylladb/hydra-loaders:cql-stress-cassandra-stress-20240119'
+ cql-stress-cassandra-stress: 'docker.io/scylladb/hydra-loaders:cql-stress-cassandra-stress-20240606'

service_level_shares: [1000]

diff --git a/docker/cql-stress-cassandra-stress/Dockerfile b/docker/cql-stress-cassandra-stress/Dockerfile
--- a/docker/cql-stress-cassandra-stress/Dockerfile
+++ b/docker/cql-stress-cassandra-stress/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.73 as builder
+FROM rust:1.78 as builder

ARG BRANCH
ARG REPO
diff --git a/docker/cql-stress-cassandra-stress/image b/docker/cql-stress-cassandra-stress/image
--- a/docker/cql-stress-cassandra-stress/image
+++ b/docker/cql-stress-cassandra-stress/image
@@ -1 +1 @@
-scylladb/hydra-loaders:cql-stress-cassandra-stress-20240119
+docker.io/scylladb/hydra-loaders:cql-stress-cassandra-stress-20240606
diff --git a/sdcm/cql_stress_cassandra_stress_thread.py b/sdcm/cql_stress_cassandra_stress_thread.py
--- a/sdcm/cql_stress_cassandra_stress_thread.py
+++ b/sdcm/cql_stress_cassandra_stress_thread.py
@@ -97,6 +97,13 @@ def create_stress_cmd(self, cmd_runner, keyspace_idx, loader): # pylint: disabl
stress_cmd = re.sub(r' seq=[\s]*([\d]+\.\.[\d]+)',
r" 'dist=SEQ(\1)'", stress_cmd)

+ credentials = self.loader_set.get_db_auth()
+ if credentials and 'user=' not in stress_cmd:
+ if '-mode' in stress_cmd:
+ # put the credentials into the right place into -mode section
+ stress_cmd = re.sub(r'(-mode.*?)(-)?', r'\1 user={} password={} \2'.format(*credentials), stress_cmd)
+ else:
+ stress_cmd += ' -mode user={} password={} '.format(*credentials)
stress_cmd = self.adjust_cmd_node_option(stress_cmd, loader, cmd_runner)
return stress_cmd

diff --git a/unit_tests/test_config.py b/unit_tests/test_config.py
--- a/unit_tests/test_config.py
+++ b/unit_tests/test_config.py
@@ -667,7 +667,7 @@ def test_21_nested_values(self):
'kcl': 'scylladb/hydra-loaders:kcl-jdk8-20210526-ShardSyncStrategyType-PERIODIC',
'harry': 'scylladb/hydra-loaders:cassandra-harry-jdk11-20220816',
'latte': 'scylladb/hydra-loaders:latte-0.25.2-scylladb',
- 'cql-stress-cassandra-stress': 'scylladb/hydra-loaders:cql-stress-cassandra-stress-20240119'})
+ 'cql-stress-cassandra-stress': 'docker.io/scylladb/hydra-loaders:cql-stress-cassandra-stress-20240606'})

self.assertEqual(conf.get('stress_image.gemini'), 'scylladb/hydra-loaders:gemini-v1.8.6')
self.assertEqual(conf.get('stress_image.non-exist'), None)
diff --git a/unit_tests/test_cql_stress_cassandra_stress_thread.py b/unit_tests/test_cql_stress_cassandra_stress_thread.py
--- a/unit_tests/test_cql_stress_cassandra_stress_thread.py
+++ b/unit_tests/test_cql_stress_cassandra_stress_thread.py
@@ -27,12 +27,12 @@


def test_01_cql_stress_cassandra_stress(request, docker_scylla, prom_address, params):
- loader_set = LocalLoaderSetDummy()
+ loader_set = LocalLoaderSetDummy(params=params)

cmd = (
"""cql-stress-cassandra-stress write cl=ONE duration=1m """
"""-schema 'replication(strategy=NetworkTopologyStrategy,replication_factor=1) """
- """compaction(strategy=SizeTieredCompactionStrategy)' """
+ """compaction(strategy=SizeTieredCompactionStrategy)' -mode cql3 """
"""-rate threads=10 -pop seq=1..10000000"""
)

@@ -68,7 +68,7 @@ def check_metrics():


def test_02_cql_stress_cassandra_stress_multi_region(request, docker_scylla, params):
- loader_set = LocalLoaderSetDummy()
+ loader_set = LocalLoaderSetDummy(params=params)
loader_set.test_config.set_multi_region(True)
request.addfinalizer(
lambda: loader_set.test_config.set_multi_region(False))