Repository: ignite Updated Branches: refs/heads/ignite-1093-2 8cc813e8c -> cf633b373
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf633b37 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf633b37 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf633b37 Branch: refs/heads/ignite-1093-2 Commit: cf633b373cb66c43243be76ffba113aecec4e25d Parents: 8cc813e Author: Anton Vinogradov <[email protected]> Authored: Sun Oct 11 19:21:14 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Sun Oct 11 19:21:14 2015 +0300 ---------------------------------------------------------------------- .../GridCachePartitionExchangeManager.java | 8 ++++--- .../GridCacheRebalancingSyncSelfTest.java | 25 ++++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf633b37/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index e8c022f..7a210ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1291,18 +1291,20 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana orderMap.get(-2).add(mId); - //Utility cache second. + //Utility & atomic cache second. int uId = CU.cacheId(GridCacheUtils.UTILITY_CACHE_NAME); + int aId = CU.cacheId(GridCacheUtils.ATOMICS_CACHE_NAME); - orderMap.put(-1, new ArrayList<Integer>(1)); + orderMap.put(-1, new ArrayList<Integer>(2)); orderMap.get(-1).add(uId); + orderMap.get(-1).add(aId); //Others. for (Map.Entry<Integer, GridDhtPreloaderAssignments> e : assignsMap.entrySet()) { int cacheId = e.getKey(); - if (cacheId != uId && cacheId != mId) { + if (cacheId != uId && cacheId != mId && cacheId != aId) { GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId); int order = cacheCtx.config().getRebalanceOrder(); http://git-wip-us.apache.org/repos/asf/ignite/blob/cf633b37/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 78f8320..b5f627a 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 @@ -313,18 +313,19 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { } } - public void _test() throws Exception { - testTimeout = Integer.MAX_VALUE; - - while (true) { - testComplexRebalancing(); - - U.sleep(5000); - - System.gc(); - - } - } +// static{ +// testTimeout = Integer.MAX_VALUE; +// } +// public void test() throws Exception { +// while (true) { +// testComplexRebalancing(); +// +// U.sleep(5000); +// +// System.gc(); +// +// } +// } @Override protected long getTestTimeout() { return testTimeout;
