Repository: ignite Updated Branches: refs/heads/ignite-1093-3 9a9928b9a -> 98d287586
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98d28758 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98d28758 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98d28758 Branch: refs/heads/ignite-1093-3 Commit: 98d287586d52e11b5419a2ec6b0c27aed9f60853 Parents: 9a9928b Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 29 14:02:26 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 29 14:02:26 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/98d28758/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 6793f9f..382c975 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 @@ -1297,6 +1297,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana } Callable<Boolean> marsR = null; + LinkedList<Callable<Boolean>> orderedRs = new LinkedList<>(); //Ordered rebalance scheduling. for (Integer order : orderMap.keySet()) { @@ -1321,7 +1322,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (cacheId == CU.cacheId(GridCacheUtils.MARSH_CACHE_NAME)) marsR = r; else - rebalancingQueue.add(r); + orderedRs.add(r); } } } @@ -1329,6 +1330,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana if (asyncStartFut != null) asyncStartFut.get(); // Wait for thread stop. + rebalancingQueue.addAll(orderedRs); + if (marsR != null || !rebalancingQueue.isEmpty()) { if (futQ.isEmpty()) { U.log(log, "Starting caches rebalancing [top=" + exchFut.topologyVersion() + "]");
