Repository: ignite Updated Branches: refs/heads/ignite-1093-2 92e3cbefb -> c10b69c2c
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c10b69c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c10b69c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c10b69c2 Branch: refs/heads/ignite-1093-2 Commit: c10b69c2c7c2ee5689369796c61460e940f25486 Parents: 92e3cbe Author: Anton Vinogradov <a...@apache.org> Authored: Mon Oct 26 12:50:53 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Oct 26 12:50:53 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/IgniteKernal.java | 10 ++++++++++ .../rebalancing/GridCacheRebalancingSyncSelfTest.java | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c10b69c2/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 36d5bd0..c867fe6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -734,6 +734,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ackEnvironmentVariables(); ackCacheConfiguration(); ackP2pConfiguration(); + ackRebalanceConfiguration(); // Run background network diagnostics. GridDiagnostic.runBackgroundCheck(gridName, execSvc, log); @@ -2137,6 +2138,15 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { /** * */ + private void ackRebalanceConfiguration() throws IgniteCheckedException { + if (cfg.getSystemThreadPoolSize() <= cfg.getRebalanceThreadPoolSize()) + throw new IgniteCheckedException("Rebalance thread pool size exceed or equals System thread pool size. " + + "Change IgniteConfiguration.rebalanceThreadPoolSize property before next start."); + } + + /** + * + */ private void ackCacheConfiguration() { CacheConfiguration[] cacheCfgs = cfg.getCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/c10b69c2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java index b9bc96b..795bf91 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncSelfTest.java @@ -108,8 +108,6 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { cacheRCfg.setRebalanceBatchSize(1); cacheRCfg.setRebalanceBatchesCount(Integer.MAX_VALUE); ((TcpCommunicationSpi)iCfg.getCommunicationSpi()).setSharedMemoryPort(-1);//Shmem fix for Integer.MAX_VALUE. - //hang on o.a.i.i.util.nio.GridShmemCommunicationClient.sendMessage(GridShmemCommunicationClient.java:126) - //Todo: fix or create issue CacheConfiguration<Integer, Integer> cacheRCfg2 = new CacheConfiguration<>();
