From b36471f4cd93cb0c706c234ac545f5979440577e Mon Sep 17 00:00:00 2001 From: Israel Fruchter Date: Mon, 24 Jul 2023 23:29:49 +0300 Subject: [PATCH] scylla_cluster,scylla_node: incress debug timeout for `watch_rest_for_alive` seems like the 360s default for debug for `watch_rest_for_alive` isn't enough as it was for `watch_log_for_alive`, making it 600s (10min) Fix: #477 --- ccmlib/scylla_cluster.py | 3 ++- ccmlib/scylla_node.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ccmlib/scylla_cluster.py b/ccmlib/scylla_cluster.py index 511b505a..da05a6a7 100644 --- a/ccmlib/scylla_cluster.py +++ b/ccmlib/scylla_cluster.py @@ -146,7 +146,8 @@ def start_nodes(self, nodes=None, no_wait=False, verbose=False, wait_for_binary_ for old_node, _ in marks: for node, _, _ in started: if old_node is not node: - old_node.watch_rest_for_alive(node) + t = 120 if self.scylla_mode != 'debug' else 600 + old_node.watch_rest_for_alive(node, t=t) return started diff --git a/ccmlib/scylla_node.py b/ccmlib/scylla_node.py index 8ce4323e..bff48929 100644 --- a/ccmlib/scylla_node.py +++ b/ccmlib/scylla_node.py @@ -309,7 +309,7 @@ def _start_scylla(self, args, marks, update_pid, wait_other_notice, if wait_other_notice: for node, _ in marks: - t = timeout if timeout is not None else 120 if self.cluster.scylla_mode != 'debug' else 360 + t = timeout if timeout is not None else 120 if self.cluster.scylla_mode != 'debug' else 600 node.watch_rest_for_alive(self, timeout=t) self.watch_rest_for_alive(node, timeout=t)