You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2021/03/26 06:57:33 UTC

[ignite] branch ignite-ducktape updated: IGNITE-14395 Shorter test results directory name (#8932)

This is an automated email from the ASF dual-hosted git repository.

nizhikov 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 488ecfe  IGNITE-14395 Shorter test results directory name (#8932)
488ecfe is described below

commit 488ecfe2d8adb1a8be17716f2cd25483101e579e
Author: Dmitriy Sorokin <sb...@gmail.com>
AuthorDate: Fri Mar 26 09:57:05 2021 +0300

    IGNITE-14395 Shorter test results directory name (#8932)
---
 .../ignitetest/tests/rebalance/in_memory_test.py   | 58 +++++++++++++++++-----
 1 file changed, 46 insertions(+), 12 deletions(-)

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 998272c..5056b7c 100644
--- a/modules/ducktests/tests/ignitetest/tests/rebalance/in_memory_test.py
+++ b/modules/ducktests/tests/ignitetest/tests/rebalance/in_memory_test.py
@@ -52,19 +52,53 @@ class RebalanceInMemoryTest(IgniteTest):
     # pylint: disable=too-many-arguments, too-many-locals
     @cluster(num_nodes=NUM_NODES)
     @ignite_versions(str(DEV_BRANCH), str(LATEST))
-    @defaults(trigger_event=[TriggerEvent.NODE_JOIN, TriggerEvent.NODE_LEFT],
-              backups=[1], cache_count=[1], entry_count=[15_000], entry_size=[50_000],
-              rebalance_thread_pool_size=[None], rebalance_batch_size=[None],
-              rebalance_batches_prefetch_count=[None], rebalance_throttle=[None])
-    def test(self, ignite_version, trigger_event,
-             backups, cache_count, entry_count, entry_size,
-             rebalance_thread_pool_size, rebalance_batch_size,
-             rebalance_batches_prefetch_count, rebalance_throttle):
+    @defaults(backups=[1], cache_count=[1], entry_count=[15_000], entry_size=[50_000],
+              thread_pool_size=[None], batch_size=[None], batches_prefetch_count=[None], throttle=[None])
+    def test_node_join(self, ignite_version,
+                       backups, cache_count, entry_count, entry_size,
+                       thread_pool_size, batch_size, batches_prefetch_count, throttle):
+        """
+        Tests rebalance on node join.
+        """
+        return self.__run(ignite_version, TriggerEvent.NODE_JOIN,
+                          backups, cache_count, entry_count, entry_size,
+                          thread_pool_size, batch_size, batches_prefetch_count, throttle)
+
+    # pylint: disable=too-many-arguments, too-many-locals
+    @cluster(num_nodes=NUM_NODES)
+    @ignite_versions(str(DEV_BRANCH), str(LATEST))
+    @defaults(backups=[1], cache_count=[1], entry_count=[15_000], entry_size=[50_000],
+              thread_pool_size=[None], batch_size=[None], batches_prefetch_count=[None], throttle=[None])
+    def test_node_left(self, ignite_version,
+                       backups, cache_count, entry_count, entry_size,
+                       thread_pool_size, batch_size, batches_prefetch_count, throttle):
+        """
+        Tests rebalance on node left.
+        """
+        return self.__run(ignite_version, TriggerEvent.NODE_LEFT,
+                          backups, cache_count, entry_count, entry_size,
+                          thread_pool_size, batch_size, batches_prefetch_count, throttle)
+
+    # pylint: disable=too-many-arguments, too-many-locals
+    def __run(self, ignite_version, trigger_event,
+              backups, cache_count, entry_count, entry_size,
+              thread_pool_size, batch_size, batches_prefetch_count, throttle):
         """
         Test performs rebalance test which consists of following steps:
             * Start cluster.
             * Put data to it via IgniteClientApp.
             * Triggering a rebalance event and awaits for rebalance to finish.
+        :param ignite_version: Ignite version.
+        :param trigger_event: Trigger event.
+        :param backups: Backup count.
+        :param cache_count: Cache count.
+        :param entry_count: Cache entry count.
+        :param entry_size: Cache entry size.
+        :param thread_pool_size: rebalanceThreadPoolSize config property.
+        :param batch_size: rebalanceBatchSize config property.
+        :param batches_prefetch_count: rebalanceBatchesPrefetchCount config property.
+        :param throttle: rebalanceThrottle config property.
+        :return: Rebalance and data preload stats.
         """
         node_count = len(self.test_context.cluster) - 1
 
@@ -75,10 +109,10 @@ class RebalanceInMemoryTest(IgniteTest):
                     cache_count * entry_count * entry_size * (backups + 1),
                     self.DEFAULT_DATA_REGION_SZ))),
             metric_exporter="org.apache.ignite.spi.metric.jmx.JmxMetricExporterSpi",
-            rebalance_thread_pool_size=rebalance_thread_pool_size,
-            rebalance_batch_size=rebalance_batch_size,
-            rebalance_batches_prefetch_count=rebalance_batches_prefetch_count,
-            rebalance_throttle=rebalance_throttle)
+            rebalance_thread_pool_size=thread_pool_size,
+            rebalance_batch_size=batch_size,
+            rebalance_batches_prefetch_count=batches_prefetch_count,
+            rebalance_throttle=throttle)
 
         ignites = IgniteService(self.test_context, config=node_config,
                                 num_nodes=node_count if trigger_event else node_count - 1)