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: scylladb#477
fruch · Jul 24, 2023 · b36471f · b36471f
1 parent 65872f6
commit b36471f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)