You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2021/03/30 07:50:35 UTC
[ignite] branch ignite-ducktape updated: IGNITE-14437 : Adjust test
params: exclude input net failures with disabled connRecovery (#8942)
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 62474bc IGNITE-14437 : Adjust test params: exclude input net failures with disabled connRecovery (#8942)
62474bc is described below
commit 62474bc50f0af41510c788319aa392eae2cd24ef
Author: Vladimir Steshin <vl...@gmail.com>
AuthorDate: Tue Mar 30 10:50:17 2021 +0300
IGNITE-14437 : Adjust test params: exclude input net failures with disabled connRecovery (#8942)
---
.../tests/ignitetest/tests/discovery_test.py | 46 ++++++++++++++++------
1 file changed, 35 insertions(+), 11 deletions(-)
diff --git a/modules/ducktests/tests/ignitetest/tests/discovery_test.py b/modules/ducktests/tests/ignitetest/tests/discovery_test.py
index 3e82085..4735b88 100644
--- a/modules/ducktests/tests/ignitetest/tests/discovery_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/discovery_test.py
@@ -92,32 +92,56 @@ class DiscoveryTest(IgniteTest):
@cluster(num_nodes=MAX_CONTAINERS)
@ignite_versions(str(DEV_BRANCH), str(LATEST))
- @matrix(nodes_to_kill=[1, 2], disable_conn_recovery=[False, True],
- net_part=[IgniteService.NetPart.ALL, IgniteService.NetPart.INPUT],
+ @matrix(nodes_to_kill=[1, 2], net_part=[IgniteService.NetPart.ALL, IgniteService.NetPart.INPUT],
load_type=[ClusterLoad.ATOMIC, ClusterLoad.TRANSACTIONAL])
- def test_nodes_fail_not_sequential_tcp(self, ignite_version, nodes_to_kill, load_type, disable_conn_recovery: bool,
- net_part: IgniteService.NetPart):
+ def test_nonsequential_failure_tcp(self, ignite_version, nodes_to_kill, load_type, net_part: IgniteService.NetPart):
"""
Test nodes failure scenario with TcpDiscoverySpi not allowing nodes to fail in a row.
"""
test_config = DiscoveryTestConfig(version=IgniteVersion(ignite_version), nodes_to_kill=nodes_to_kill,
load_type=ClusterLoad.construct_from(load_type), sequential_failure=False,
- disable_conn_recovery=disable_conn_recovery, net_part=net_part)
+ net_part=net_part)
+
+ return self._perform_node_fail_scenario(test_config)
+
+ @cluster(num_nodes=MAX_CONTAINERS)
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
+ @matrix(nodes_to_kill=[1, 2], load_type=[ClusterLoad.ATOMIC, ClusterLoad.TRANSACTIONAL])
+ def test_nonsequential_failure_tcp_no_recovery(self, ignite_version, nodes_to_kill, load_type):
+ """
+ Test nodes failure scenario with TcpDiscoverySpi not allowing nodes to fail in a row with. The connection
+ recovery is disabled.
+ """
+ test_config = DiscoveryTestConfig(version=IgniteVersion(ignite_version), nodes_to_kill=nodes_to_kill,
+ load_type=ClusterLoad.construct_from(load_type), sequential_failure=False,
+ disable_conn_recovery=True)
return self._perform_node_fail_scenario(test_config)
@cluster(num_nodes=MAX_CONTAINERS)
@ignite_versions(str(DEV_BRANCH), str(LATEST))
@matrix(load_type=[ClusterLoad.ATOMIC, ClusterLoad.TRANSACTIONAL],
- net_part=[IgniteService.NetPart.ALL, IgniteService.NetPart.INPUT], disable_conn_recovery=[False, True])
- def test_2_nodes_fail_sequential_tcp(self, ignite_version, load_type, disable_conn_recovery: bool,
- net_part: IgniteService.NetPart):
+ net_part=[IgniteService.NetPart.ALL, IgniteService.NetPart.INPUT])
+ def test_sequential_failure_tcp(self, ignite_version, load_type, net_part: IgniteService.NetPart):
"""
Test 2 nodes sequential failure scenario with TcpDiscoverySpi.
"""
test_config = DiscoveryTestConfig(version=IgniteVersion(ignite_version), nodes_to_kill=2,
load_type=ClusterLoad.construct_from(load_type), sequential_failure=True,
- disable_conn_recovery=disable_conn_recovery, net_part=net_part)
+ net_part=net_part)
+
+ return self._perform_node_fail_scenario(test_config)
+
+ @cluster(num_nodes=MAX_CONTAINERS)
+ @ignite_versions(str(DEV_BRANCH), str(LATEST))
+ @matrix(load_type=[ClusterLoad.ATOMIC, ClusterLoad.TRANSACTIONAL])
+ def test_sequential_failure_tcp_no_recovery(self, ignite_version, load_type):
+ """
+ Test 2 nodes sequential failure scenario with TcpDiscoverySpi. The connection recovery is disabled.
+ """
+ test_config = DiscoveryTestConfig(version=IgniteVersion(ignite_version), nodes_to_kill=2,
+ load_type=ClusterLoad.construct_from(load_type), sequential_failure=True,
+ disable_conn_recovery=True)
return self._perform_node_fail_scenario(test_config)
@@ -333,9 +357,9 @@ def choose_node_to_kill(servers, nodes_to_kill, sequential):
"""Choose node to kill during test"""
assert nodes_to_kill > 0, "No nodes to kill passed. Check the parameters."
- idx = random.randint(0, len(servers.nodes)-1)
+ idx = random.randint(0, len(servers.nodes) - 1)
- to_kill = servers.nodes[idx:] + servers.nodes[:idx-1]
+ to_kill = servers.nodes[idx:] + servers.nodes[:idx - 1]
if not sequential:
to_kill = to_kill[0::2]