Repository: ignite Updated Branches: refs/heads/ignite-1093-2 88b446d1f -> b76252e11
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b76252e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b76252e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b76252e1 Branch: refs/heads/ignite-1093-2 Commit: b76252e11af62fabb657f454880ef5bc4879ecac Parents: 88b446d Author: Anton Vinogradov <[email protected]> Authored: Mon Oct 19 17:46:26 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Mon Oct 19 17:46:26 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionDemander.java | 30 +++++++++----------- 1 file changed, 14 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b76252e1/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 f2f0bec..71d4d58 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 @@ -959,31 +959,29 @@ public class GridDhtPartitionDemander { preloadEvent(EVT_CACHE_REBALANCE_STOPPED, exchFut.discoveryEvent()); if (log.isDebugEnabled()) - log.debug("Completed sync future."); + log.debug("Completed rebalance future."); - if (cctx.affinity().affinityTopologyVersion().equals(topVer)) { + cctx.shared().exchange().scheduleResendPartitions(); - Collection<Integer> m = new HashSet<>(); + Collection<Integer> m = new HashSet<>(); - for (Map.Entry<UUID, Collection<Integer>> e : missed.entrySet()) { - if (e.getValue() != null && !e.getValue().isEmpty()) - m.addAll(e.getValue()); - } + for (Map.Entry<UUID, Collection<Integer>> e : missed.entrySet()) { + if (e.getValue() != null && !e.getValue().isEmpty()) + m.addAll(e.getValue()); + } - if (!m.isEmpty()) { - U.log(log, ("Reassigning partitions that were missed: " + m)); + if (!m.isEmpty()) { + U.log(log, ("Reassigning partitions that were missed: " + m)); - onDone(false); //Finished but has missed partitions and forced dummy exchange + onDone(false); //Finished but has missed partitions, will force dummy exchange - cctx.shared().exchange().forceDummyExchange(true, exchFut); + cctx.shared().exchange().forceDummyExchange(true, exchFut); - return; - } - - cctx.shared().exchange().scheduleResendPartitions(); + return; } - if (!cancelled && !cctx.preloader().syncFuture().isDone()) + if (!cancelled && !cctx.preloader().syncFuture().isDone() && + cctx.affinity().affinityTopologyVersion().equals(topVer)) ((GridFutureAdapter)cctx.preloader().syncFuture()).onDone(); onDone(true);
