[COMMIT scylla-cluster-tests master] fix(perf): update ES with `append_scylla_yaml` dict

0 views
Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 4:00:15 AMJul 1
to scylladb-dev@googlegroups.com, Lukasz Sojka
From: Lukasz Sojka <lukasz...@scylladb.com>
Committer: Valerii Ponomarov <3796058+v...@users.noreply.github.com>
Branch: master

fix(perf): update ES with `append_scylla_yaml` dict

Since `append_scylla_yaml` is a dict and has value set, updating ES
fails with `failed to parse field [setup_details.append_scylla_yaml] of
type [text]` error.

Fix by converting it to `str` when generating `setup_details`.

---
diff --git a/sdcm/db_stats.py b/sdcm/db_stats.py
--- a/sdcm/db_stats.py
+++ b/sdcm/db_stats.py
@@ -638,6 +638,7 @@ def get_setup_details(self):

setup_details['db_cluster_node_details'] = {}
setup_details['sysctl_output'] = []
+ setup_details['append_scylla_yaml'] = str(self.params.get('append_scylla_yaml') or '')
return setup_details

def get_test_details(self):
diff --git a/unit_tests/test_scylla_yaml.py b/unit_tests/test_scylla_yaml.py
--- a/unit_tests/test_scylla_yaml.py
+++ b/unit_tests/test_scylla_yaml.py
@@ -398,7 +398,8 @@ def test_scylla_yaml(self):
'virtual_dirty_soft_limit': None,
'volatile_system_keyspace_for_testing': None,
'workdir': None,
- 'write_request_timeout_in_ms': None
+ 'write_request_timeout_in_ms': None,
+ 'enable_tablets': None,
}
)

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 5:39:14 AMJul 1
to scylladb-dev@googlegroups.com, Lukasz Sojka
From: Lukasz Sojka <lukasz...@scylladb.com>
Committer: Lukasz Sojka <soy...@gmail.com>
Branch: branch-6.0

fix(perf): update ES with `append_scylla_yaml` dict

Since `append_scylla_yaml` is a dict and has value set, updating ES
fails with `failed to parse field [setup_details.append_scylla_yaml] of
type [text]` error.

Fix by converting it to `str` when generating `setup_details`.

(cherry picked from commit 60cddb41a438512ce1abab6006966b33bbaf2bd8)

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 12:40:30 PMJul 1
to scylladb-dev@googlegroups.com, Lukasz Sojka
From: Lukasz Sojka <lukasz...@scylladb.com>
Committer: Israel Fruchter <fr...@scylladb.com>
Branch: branch-perf-v14

fix(perf): update ES with `append_scylla_yaml` dict

Since `append_scylla_yaml` is a dict and has value set, updating ES
fails with `failed to parse field [setup_details.append_scylla_yaml] of
type [text]` error.

Fix by converting it to `str` when generating `setup_details`.

(cherry picked from commit 60cddb41a438512ce1abab6006966b33bbaf2bd8)

---
diff --git a/sdcm/db_stats.py b/sdcm/db_stats.py
--- a/sdcm/db_stats.py
+++ b/sdcm/db_stats.py
@@ -624,6 +624,7 @@ def get_setup_details(self):

setup_details['db_cluster_node_details'] = {}
setup_details['sysctl_output'] = []
+ setup_details['append_scylla_yaml'] = str(self.params.get('append_scylla_yaml') or '')
return setup_details

def get_test_details(self):
diff --git a/unit_tests/test_scylla_yaml.py b/unit_tests/test_scylla_yaml.py
--- a/unit_tests/test_scylla_yaml.py
+++ b/unit_tests/test_scylla_yaml.py
@@ -391,7 +391,8 @@ def test_scylla_yaml(self):
Reply all
Reply to author
Forward
0 new messages