This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 1d66acf72f7 IGNITE-17912 Ducktape tests fix (#10319)
1d66acf72f7 is described below
commit 1d66acf72f7635b7afcb234fa00f259c1b8ab6d4
Author: Nikolay <[email protected]>
AuthorDate: Mon Oct 17 13:47:49 2022 +0300
IGNITE-17912 Ducktape tests fix (#10319)
---
.../tests/control_utility/consistency_test.py | 2 +-
.../ignitetest/tests/rebalance/in_memory_test.py | 16 ++++----
.../ignitetest/tests/rebalance/persistent_test.py | 44 ++++++++++++----------
.../tests/ignitetest/tests/rebalance/util.py | 14 ++++---
4 files changed, 43 insertions(+), 33 deletions(-)
diff --git
a/modules/ducktests/tests/ignitetest/tests/control_utility/consistency_test.py
b/modules/ducktests/tests/ignitetest/tests/control_utility/consistency_test.py
index 25998909f5f..de791637368 100644
---
a/modules/ducktests/tests/ignitetest/tests/control_utility/consistency_test.py
+++
b/modules/ducktests/tests/ignitetest/tests/control_utility/consistency_test.py
@@ -103,7 +103,7 @@ class ConsistencyTest(IgniteTest):
pass
# checking/repairing
- control_utility.check_consistency(f"repair --cache {self.CACHE_NAME}
--partition 0 --strategy LWW")
+ control_utility.check_consistency(f"repair --cache {self.CACHE_NAME}
--partitions 0 --strategy LWW")
message = "Cache consistency violations recorded."
diff --git
a/modules/ducktests/tests/ignitetest/tests/rebalance/in_memory_test.py
b/modules/ducktests/tests/ignitetest/tests/rebalance/in_memory_test.py
index 897752478a1..d1213d65ffd 100644
--- a/modules/ducktests/tests/ignitetest/tests/rebalance/in_memory_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/rebalance/in_memory_test.py
@@ -22,7 +22,7 @@ from ignitetest.services.ignite import IgniteService
from ignitetest.services.utils.ignite_configuration.discovery import
from_ignite_cluster
from ignitetest.tests.rebalance.util import start_ignite, get_result,
TriggerEvent, NUM_NODES, \
await_rebalance_start, RebalanceParams
-from ignitetest.tests.util import preload_data
+from ignitetest.tests.util import preload_data, DataGenerationParams
from ignitetest.utils import cluster, ignite_versions
from ignitetest.utils.ignite_test import IgniteTest
from ignitetest.utils.version import DEV_BRANCH, LATEST
@@ -81,17 +81,19 @@ class RebalanceInMemoryTest(IgniteTest):
:param throttle: rebalanceThrottle config property.
:return: Rebalance and data preload stats.
"""
- reb_params = RebalanceParams(trigger_event=trigger_event,
backups=backups, cache_count=cache_count,
- entry_count=entry_count,
entry_size=entry_size, preloaders=preloaders,
- thread_pool_size=thread_pool_size,
batch_size=batch_size,
-
batches_prefetch_count=batches_prefetch_count, throttle=throttle)
+ reb_params = RebalanceParams(trigger_event=trigger_event,
thread_pool_size=thread_pool_size,
+ batch_size=batch_size,
batches_prefetch_count=batches_prefetch_count,
+ throttle=throttle)
- ignites = start_ignite(self.test_context, ignite_version, reb_params)
+ data_gen_params = DataGenerationParams(backups=backups,
cache_count=cache_count, entry_count=entry_count,
+ entry_size=entry_size,
preloaders=preloaders)
+
+ ignites = start_ignite(self.test_context, ignite_version, reb_params,
data_gen_params)
preload_time = preload_data(
self.test_context,
ignites.config._replace(client_mode=True,
discovery_spi=from_ignite_cluster(ignites)),
- data_gen_params=reb_params)
+ data_gen_params=data_gen_params)
if trigger_event:
ignites.stop_node(ignites.nodes[-1])
diff --git
a/modules/ducktests/tests/ignitetest/tests/rebalance/persistent_test.py
b/modules/ducktests/tests/ignitetest/tests/rebalance/persistent_test.py
index 722bfaaf2b9..1aba0d71e3f 100644
--- a/modules/ducktests/tests/ignitetest/tests/rebalance/persistent_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/rebalance/persistent_test.py
@@ -25,7 +25,7 @@ from ignitetest.services.utils.ignite_aware import
IgniteAwareService
from ignitetest.services.utils.ignite_configuration.discovery import
from_ignite_cluster
from ignitetest.tests.rebalance.util import NUM_NODES, start_ignite,
TriggerEvent, \
get_result, check_type_of_rebalancing, await_rebalance_start,
RebalanceParams
-from ignitetest.tests.util import preload_data
+from ignitetest.tests.util import preload_data, DataGenerationParams
from ignitetest.utils import cluster, ignite_versions
from ignitetest.utils.ignite_test import IgniteTest
from ignitetest.utils.version import DEV_BRANCH, LATEST
@@ -45,12 +45,14 @@ class RebalancePersistentTest(IgniteTest):
Tests rebalance on node join.
"""
- reb_params = RebalanceParams(trigger_event=TriggerEvent.NODE_JOIN,
backups=backups, cache_count=cache_count,
- entry_count=entry_count,
entry_size=entry_size, preloaders=preloaders,
- thread_pool_size=thread_pool_size,
batch_size=batch_size,
-
batches_prefetch_count=batches_prefetch_count, throttle=throttle,
persistent=True)
+ reb_params = RebalanceParams(trigger_event=TriggerEvent.NODE_JOIN,
thread_pool_size=thread_pool_size,
+ batch_size=batch_size,
batches_prefetch_count=batches_prefetch_count,
+ throttle=throttle, persistent=True)
- ignites = start_ignite(self.test_context, ignite_version, reb_params)
+ data_gen_params = DataGenerationParams(backups=backups,
cache_count=cache_count, entry_count=entry_count,
+ entry_size=entry_size,
preloaders=preloaders)
+
+ ignites = start_ignite(self.test_context, ignite_version, reb_params,
data_gen_params)
control_utility = ControlUtility(ignites)
@@ -59,7 +61,7 @@ class RebalancePersistentTest(IgniteTest):
preload_time = preload_data(
self.test_context,
ignites.config._replace(client_mode=True,
discovery_spi=from_ignite_cluster(ignites)),
- data_gen_params=reb_params)
+ data_gen_params=data_gen_params)
new_node = IgniteService(self.test_context,
ignites.config._replace(discovery_spi=from_ignite_cluster(ignites)),
num_nodes=1)
@@ -91,12 +93,14 @@ class RebalancePersistentTest(IgniteTest):
Tests rebalance on node left.
"""
- reb_params = RebalanceParams(trigger_event=TriggerEvent.NODE_LEFT,
backups=backups, cache_count=cache_count,
- entry_count=entry_count,
entry_size=entry_size, preloaders=preloaders,
- thread_pool_size=thread_pool_size,
batch_size=batch_size,
-
batches_prefetch_count=batches_prefetch_count, throttle=throttle,
persistent=True)
+ reb_params = RebalanceParams(trigger_event=TriggerEvent.NODE_LEFT,
thread_pool_size=thread_pool_size,
+ batch_size=batch_size,
batches_prefetch_count=batches_prefetch_count,
+ throttle=throttle, persistent=True)
+
+ data_gen_params = DataGenerationParams(backups=backups,
cache_count=cache_count, entry_count=entry_count,
+ entry_size=entry_size,
preloaders=preloaders)
- ignites = start_ignite(self.test_context, ignite_version, reb_params)
+ ignites = start_ignite(self.test_context, ignite_version, reb_params,
data_gen_params)
control_utility = ControlUtility(ignites)
@@ -105,7 +109,7 @@ class RebalancePersistentTest(IgniteTest):
preload_time = preload_data(
self.test_context,
ignites.config._replace(client_mode=True,
discovery_spi=from_ignite_cluster(ignites)),
- data_gen_params=reb_params)
+ data_gen_params=data_gen_params)
self.logger.debug(f'DB size before rebalance:
{get_database_size_mb(ignites.nodes, ignites.database_dir)}')
@@ -138,15 +142,17 @@ class RebalancePersistentTest(IgniteTest):
preload_entries = 10_000
- reb_params = RebalanceParams(trigger_event=TriggerEvent.NODE_JOIN,
backups=backups, cache_count=cache_count,
- entry_count=entry_count,
entry_size=entry_size, preloaders=preloaders,
- thread_pool_size=thread_pool_size,
batch_size=batch_size,
-
batches_prefetch_count=batches_prefetch_count, throttle=throttle,
persistent=True,
+ reb_params = RebalanceParams(trigger_event=TriggerEvent.NODE_JOIN,
thread_pool_size=thread_pool_size,
+ batch_size=batch_size,
batches_prefetch_count=batches_prefetch_count,
+ throttle=throttle, persistent=True,
jvm_opts=['-DIGNITE_PDS_WAL_REBALANCE_THRESHOLD=0',
'-DIGNITE_PREFER_WAL_REBALANCE=true']
)
- ignites = start_ignite(self.test_context, ignite_version, reb_params)
+ data_gen_params = DataGenerationParams(backups=backups,
cache_count=cache_count, entry_count=entry_count,
+ entry_size=entry_size,
preloaders=preloaders)
+
+ ignites = start_ignite(self.test_context, ignite_version, reb_params,
data_gen_params)
control_utility = ControlUtility(ignites)
control_utility.activate()
@@ -174,7 +180,7 @@ class RebalancePersistentTest(IgniteTest):
preload_time = preload_data(
self.test_context,
ignites.config._replace(client_mode=True,
discovery_spi=from_ignite_cluster(ignites)),
- data_gen_params=reb_params)
+ data_gen_params=data_gen_params)
control_utility.deactivate()
control_utility.activate()
diff --git a/modules/ducktests/tests/ignitetest/tests/rebalance/util.py
b/modules/ducktests/tests/ignitetest/tests/rebalance/util.py
index 1971f48b9ea..18ebb173c5a 100644
--- a/modules/ducktests/tests/ignitetest/tests/rebalance/util.py
+++ b/modules/ducktests/tests/ignitetest/tests/rebalance/util.py
@@ -43,7 +43,7 @@ class TriggerEvent(IntEnum):
NODE_LEFT = 1
-class RebalanceParams(DataGenerationParams):
+class RebalanceParams(NamedTuple):
"""
Rebalance parameters
"""
@@ -67,28 +67,30 @@ class RebalanceMetrics(NamedTuple):
node: str = None
-def start_ignite(test_context, ignite_version: str, rebalance_params:
RebalanceParams) -> IgniteService:
+def start_ignite(test_context, ignite_version: str, rebalance_params:
RebalanceParams,
+ data_gen_params: DataGenerationParams) -> IgniteService:
"""
Start IgniteService:
:param test_context: Test context.
:param ignite_version: Ignite version.
:param rebalance_params: Rebalance parameters.
+ :param data_gen_params: Data generation parameters.
:return: IgniteService.
"""
- node_count = test_context.available_cluster_size -
rebalance_params.preloaders
+ node_count = test_context.available_cluster_size -
data_gen_params.preloaders
if rebalance_params.persistent:
data_storage = DataStorageConfiguration(
- max_wal_archive_size=2 * rebalance_params.data_region_max_size,
+ max_wal_archive_size=2 * data_gen_params.data_region_max_size,
default=DataRegionConfiguration(
persistence_enabled=True,
- max_size=rebalance_params.data_region_max_size
+ max_size=data_gen_params.data_region_max_size
)
)
else:
data_storage = DataStorageConfiguration(
-
default=DataRegionConfiguration(max_size=rebalance_params.data_region_max_size)
+
default=DataRegionConfiguration(max_size=data_gen_params.data_region_max_size)
)
node_config = IgniteConfiguration(
