diff --git a/ccmlib/scylla_cluster.py b/ccmlib/scylla_cluster.py index 511b505a..dcd376f5 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, timeout=t) return started diff --git a/ccmlib/scylla_node.py b/ccmlib/scylla_node.py index f187afa6..ba6acfea 100644 --- a/ccmlib/scylla_node.py +++ b/ccmlib/scylla_node.py @@ -310,7 +310,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)