You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2022/07/26 12:48:41 UTC
[ignite] branch master updated: IGNITE-17421 [ducktests] Fix drop network functionality (#10171)
This is an automated email from the ASF dual-hosted git repository.
ivandasch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f4c197f9ad0 IGNITE-17421 [ducktests] Fix drop network functionality (#10171)
f4c197f9ad0 is described below
commit f4c197f9ad040b6b99a36dbbb870f94422415d7b
Author: Sergey Korotkov <se...@gmail.com>
AuthorDate: Tue Jul 26 19:48:31 2022 +0700
IGNITE-17421 [ducktests] Fix drop network functionality (#10171)
---
.../ignitetest/services/utils/ignite_aware.py | 32 ++++++++++++----------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py b/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
index aec553015ca..46910dedf85 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/ignite_aware.py
@@ -338,22 +338,24 @@ class IgniteAwareService(BackgroundThreadService, IgnitePathAware, metaclass=ABC
return time_holder.get()
- @staticmethod
- def __exec_on_node(node, task, start_waiter=None, delay_ms=0, time_holder=None):
- if start_waiter:
- start_waiter.count_down()
- start_waiter.wait()
-
- if delay_ms > 0:
- time.sleep(delay_ms / 1000.0)
+ def __exec_on_node(self, node, task, start_waiter=None, delay_ms=0, time_holder=None):
+ try:
+ if start_waiter:
+ start_waiter.count_down()
+ start_waiter.wait()
- if time_holder:
- mono = time.monotonic()
- timestamp = datetime.now()
+ if delay_ms > 0:
+ time.sleep(delay_ms / 1000.0)
- time_holder.compare_and_set(None, (mono, timestamp))
+ if time_holder:
+ mono = time.monotonic()
+ timestamp = datetime.now()
- task(node)
+ time_holder.compare_and_set(None, (mono, timestamp))
+ task(node)
+ except BaseException:
+ self.logger.error("async task threw exception:", exc_info=1)
+ raise
@property
def netfilter_store_path(self):
@@ -383,8 +385,8 @@ class IgniteAwareService(BackgroundThreadService, IgnitePathAware, metaclass=ABC
cm_spi = self.config.communication_spi
dsc_spi = self.config.discovery_spi
- cm_ports = str(cm_spi.port) if cm_spi.port_range < 1 else str(cm_spi.port) + ':' + str(
- cm_spi.port + cm_spi.port_range)
+ cm_ports = str(cm_spi.local_port) if cm_spi.local_port_range < 1 else str(cm_spi.local_port) + ':' + str(
+ cm_spi.local_port + cm_spi.local_port_range)
dsc_ports = str(dsc_spi.port) if not hasattr(dsc_spi, 'port_range') or dsc_spi.port_range < 1 else str(
dsc_spi.port) + ':' + str(dsc_spi.port + dsc_spi.port_range)