ignite-1093
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dc10b85c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dc10b85c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dc10b85c Branch: refs/heads/ignite-1093 Commit: dc10b85ccc83b1f2999685a10b1997e3e4f5d18b Parents: a5bd80d Author: Anton Vinogradov <vinogradov.an...@gmail.com> Authored: Fri Aug 21 16:35:49 2015 +0300 Committer: Anton Vinogradov <vinogradov.an...@gmail.com> Committed: Fri Aug 21 16:35:49 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 5 ++++- .../rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc10b85c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 0c30630..126bde9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -339,7 +339,10 @@ public class GridDhtPartitionDemander { syncFut.append(node.id(), remainings); - int lsnrCnt = cctx.config().getRebalanceThreadPoolSize(); + int lsnrCnt = cctx.config().getRebalanceThreadPoolSize() / assigns.entrySet().size(); + + if (lsnrCnt == 0) + lsnrCnt = 1;//At least one listener per node. List<Set<Integer>> sParts = new ArrayList<>(lsnrCnt); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dc10b85c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java index d92ec86..1182254 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheMassiveRebalancingSyncSelfTest.java @@ -69,7 +69,7 @@ public class GridCacheMassiveRebalancingSyncSelfTest extends GridCommonAbstractT //cacheCfg.setRebalanceBatchSize(1024); //cacheCfg.setRebalanceBatchesCount(1); cacheCfg.setRebalanceMode(CacheRebalanceMode.SYNC); - cacheCfg.setRebalanceThreadPoolSize(8); + //cacheCfg.setRebalanceThreadPoolSize(8); cacheCfg.setBackups(1); CacheConfiguration<Integer, Integer> cacheCfg2 = new CacheConfiguration<>(); @@ -79,7 +79,7 @@ public class GridCacheMassiveRebalancingSyncSelfTest extends GridCommonAbstractT //cacheCfg2.setRebalanceBatchSize(1024); //cacheCfg2.setRebalanceBatchesCount(1); cacheCfg2.setRebalanceMode(CacheRebalanceMode.SYNC); - cacheCfg2.setRebalanceThreadPoolSize(8); + //cacheCfg2.setRebalanceThreadPoolSize(8); cacheCfg2.setBackups(1); iCfg.setCacheConfiguration(cacheCfg, cacheCfg2);
