This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch ignite-ducktape
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-ducktape by this push:
new 6bcbb89 Fix zk wait for finishing node. (#8106)
6bcbb89 is described below
commit 6bcbb896ad2eafc9959515db68197a5e8e211ee2
Author: Ivan Daschinskiy <ivanda...@gmail.com>
AuthorDate: Fri Jul 31 11:47:38 2020 +0300
Fix zk wait for finishing node. (#8106)
---
modules/ducktests/tests/ignitetest/services/zk/zookeeper.py | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
b/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
index 5c29c66..f4a0158 100644
--- a/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
+++ b/modules/ducktests/tests/ignitetest/services/zk/zookeeper.py
@@ -20,6 +20,7 @@ This module contains classes and utilities to start zookeeper
cluster for testin
import os.path
from ducktape.services.service import Service
+from ducktape.utils.util import wait_until
class ZookeeperSettings:
@@ -88,17 +89,9 @@ class ZookeeperService(Service):
node.account.ssh(start_cmd)
def wait_node(self, node, timeout_sec=20):
- idx = self.idx(node)
-
- with node.account.monitor_log(self.LOG_FILE) as monitor:
- monitor.offset = 0
- monitor.wait_until(
- "binding to port",
- timeout_sec=timeout_sec,
- err_msg="Zookeeper service didn't finish startup on %s" %
node.account.hostname
- )
+ wait_until(lambda: not self.alive(node), timeout_sec=timeout_sec)
- self.logger.info("Zookeeper node %d started on %s", idx,
node.account.hostname)
+ return not self.alive(node)
def await_quorum(self, node, timeout):
"""
