1093
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ea00ea0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ea00ea0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ea00ea0 Branch: refs/heads/ignite-1093-2 Commit: 8ea00ea0d69ae3c6c1c67f7affc7bf6710073341 Parents: 0f2800f Author: Anton Vinogradov <[email protected]> Authored: Tue Oct 13 16:56:39 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Tue Oct 13 16:56:39 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ea00ea0/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 fdbf2c8..17173dd 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 @@ -1296,6 +1296,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana orderMap.get(order).add(cacheId); } + Runnable marsR = null; + //Ordered rebalance scheduling. for (Integer order : orderMap.keySet()) { for (Integer cacheId : orderMap.get(order)) { @@ -1316,9 +1318,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana U.log(log, "Rebalancing scheduled: [cache=" + cacheCtx.name() + " , waitList=" + waitList.toString() + "]"); - //Marshaller cache rebalancing launches in sync way. if (cacheId == CU.cacheId(GridCacheUtils.MARSH_CACHE_NAME)) - r.run(); + marsR = r; else rebalancingQueue.add(r); } @@ -1329,6 +1330,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana U.sleep(10); // Wait for thread stop. } + if (marsR != null) + marsR.run();//Marshaller cache rebalancing launches in sync way. + cctx.kernalContext().closure().callLocalSafe(new GPC<Boolean>() { @Override public Boolean call() { try {
