Repository: ignite Updated Branches: refs/heads/ignite-1093-2 0560a5a55 -> db41a172b
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db41a172 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db41a172 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db41a172 Branch: refs/heads/ignite-1093-2 Commit: db41a172b0c51fbaa532e3c8a3789239772b020d Parents: 0560a5a Author: Anton Vinogradov <[email protected]> Authored: Thu Oct 15 11:34:08 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Oct 15 11:34:08 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 2 ++ .../distributed/dht/preloader/GridDhtPartitionDemander.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db41a172/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 17173dd..6737439 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 @@ -1330,6 +1330,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana U.sleep(10); // Wait for thread stop. } + U.log(log, "Starting caches rebalancing [top=" + exchFut.topologyVersion() + "]"); + if (marsR != null) marsR.run();//Marshaller cache rebalancing launches in sync way. http://git-wip-us.apache.org/repos/asf/ignite/blob/db41a172/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 27d433c..46a7d02 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 @@ -232,10 +232,17 @@ public class GridDhtPartitionDemander { RebalanceFuture wFut = (RebalanceFuture)cctx.kernalContext().cache().internalCache(name).preloader().rebalanceFuture(); if (!topologyChanged(fut) && wFut.updateSeq == fut.updateSeq) { - if (!wFut.get()) + if (!wFut.get()) { + U.log(log, "Skipping waiting of " + name + " cache [top=" + fut.topologyVersion() + + "] (cache rebalanced with missed partitions)"); + fut.cancel(); + } } else { + U.log(log, "Skipping waiting of " + name + " cache [top=" + fut.topologyVersion() + + "] (topology already changed)"); + fut.cancel(); } }
