[COMMIT scylla-cluster-tests master] fix(hot_reloading): pass correct patterns to `follow_system_log`

0 views
Skip to first unread message

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 3:39:12 AMJul 1
to scylladb-dev@googlegroups.com, Israel Fruchter
From: Israel Fruchter <fr...@scylladb.com>
Committer: Lukasz Sojka <soy...@gmail.com>
Branch: master

fix(hot_reloading): pass correct patterns to `follow_system_log`

since it didn't passed a list down to `follow_system_log` the
validation wasn't really working as expected, and could finish on
finding any of the letters from the validation phrase.

---
diff --git a/sdcm/nemesis.py b/sdcm/nemesis.py
--- a/sdcm/nemesis.py
+++ b/sdcm/nemesis.py
@@ -4316,7 +4316,7 @@ def check_ssl_reload_log(node_system_log):
with context_manager:
for node in self.cluster.nodes:
node_system_logs[node] = node.follow_system_log(
- patterns=f'messaging_service - Reloaded {{{ssl_files_location}}}')
+ patterns=[f'messaging_service - Reloaded {{"{ssl_files_location}"}}'])
node.remoter.send_files(src=f'data_dir/ssl_conf/{TLSAssets.DB_CERT}', dst='/tmp')
node.remoter.run(f"sudo cp -f /tmp/{TLSAssets.DB_CERT} {ssl_files_location}")
new_crt = node.remoter.run(f"cat {ssl_files_location}").stdout

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 7:53:36 AMJul 1
to scylladb-dev@googlegroups.com, Israel Fruchter
From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: branch-2024.2

fix(hot_reloading): pass correct patterns to `follow_system_log`

since it didn't passed a list down to `follow_system_log` the
validation wasn't really working as expected, and could finish on
finding any of the letters from the validation phrase.

(cherry picked from commit 0a9df96d329fe5581453d41069a0fb231abbf64f)

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 12:38:04 PMJul 1
to scylladb-dev@googlegroups.com, Israel Fruchter
From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: branch-5.4

fix(hot_reloading): pass correct patterns to `follow_system_log`

since it didn't passed a list down to `follow_system_log` the
validation wasn't really working as expected, and could finish on
finding any of the letters from the validation phrase.

(cherry picked from commit 0a9df96d329fe5581453d41069a0fb231abbf64f)

---
diff --git a/sdcm/nemesis.py b/sdcm/nemesis.py
--- a/sdcm/nemesis.py
+++ b/sdcm/nemesis.py
@@ -4233,7 +4233,7 @@ def check_ssl_reload_log(node_system_log):
with context_manager:
for node in self.cluster.nodes:
node_system_logs[node] = node.follow_system_log(
- patterns=f'messaging_service - Reloaded {{{ssl_files_location}}}')
+ patterns=[f'messaging_service - Reloaded {{"{ssl_files_location}"}}'])
node.remoter.send_files(src='data_dir/ssl_conf/db.crt', dst='/tmp')
node.remoter.run(f"sudo cp -f /tmp/db.crt {ssl_files_location}")

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 12:38:13 PMJul 1
to scylladb-dev@googlegroups.com, Israel Fruchter
From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: branch-2024.1

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 12:38:22 PMJul 1
to scylladb-dev@googlegroups.com, Israel Fruchter
From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: branch-6.0

fix(hot_reloading): pass correct patterns to `follow_system_log`

since it didn't passed a list down to `follow_system_log` the
validation wasn't really working as expected, and could finish on
finding any of the letters from the validation phrase.

(cherry picked from commit 0a9df96d329fe5581453d41069a0fb231abbf64f)

---
diff --git a/sdcm/nemesis.py b/sdcm/nemesis.py
--- a/sdcm/nemesis.py
+++ b/sdcm/nemesis.py
@@ -4320,7 +4320,7 @@ def check_ssl_reload_log(node_system_log):

Commit Bot

<bot@cloudius-systems.com>
unread,
Jul 1, 2024, 12:38:47 PMJul 1
to scylladb-dev@googlegroups.com, Israel Fruchter
From: Israel Fruchter <fr...@scylladb.com>
Committer: Israel Fruchter <israel....@gmail.com>
Branch: branch-2023.1

fix(hot_reloading): pass correct patterns to `follow_system_log`

since it didn't passed a list down to `follow_system_log` the
validation wasn't really working as expected, and could finish on
finding any of the letters from the validation phrase.

(cherry picked from commit 0a9df96d329fe5581453d41069a0fb231abbf64f)

---
diff --git a/sdcm/nemesis.py b/sdcm/nemesis.py
--- a/sdcm/nemesis.py
+++ b/sdcm/nemesis.py
@@ -4233,7 +4233,7 @@ def check_ssl_reload_log(node_system_log):
Reply all
Reply to author
Forward
0 new messages