Repository: ignite Updated Branches: refs/heads/ignite-1093-2 a07f8a11e -> 73ffae4ba
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/73ffae4b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/73ffae4b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/73ffae4b Branch: refs/heads/ignite-1093-2 Commit: 73ffae4baa37b309cc1857e2d79ccc9976b10cf8 Parents: a07f8a1 Author: Anton Vinogradov <[email protected]> Authored: Mon Oct 12 10:38:17 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Mon Oct 12 10:38:17 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionSupplier.java | 21 +++++++++----------- .../dht/preloader/GridDhtPreloader.java | 13 +++++++----- .../GridCacheRebalancingSyncSelfTest.java | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/73ffae4b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java index d30f3c4..9ad82ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java @@ -237,6 +237,9 @@ class GridDhtPartitionSupplier { while ((sctx != null && newReq) || partIt.hasNext()) { int part = sctx != null && newReq ? sctx.part : partIt.next(); + if (!cctx.affinity().affinityTopologyVersion().equals(d.topologyVersion())) + return; + newReq = false; GridDhtLocalPartition loc; @@ -696,18 +699,12 @@ class GridDhtPartitionSupplier { @Deprecated//Backward compatibility. To be removed in future. public void startOldListeners() { - try { - if (!cctx.kernalContext().clientNode() && cctx.rebalanceEnabled()) { - - cctx.io().addHandler(cctx.cacheId(), GridDhtPartitionDemandMessage.class, new CI2<UUID, GridDhtPartitionDemandMessage>() { - @Override public void apply(UUID id, GridDhtPartitionDemandMessage m) { - processOldDemandMessage(m, id); - } - }); - } - } - catch (Exception ex) { - U.error(log, "Unable to start backward compatibility rebalancing lixteners", ex); + if (!cctx.kernalContext().clientNode() && cctx.rebalanceEnabled()) { + cctx.io().addHandler(cctx.cacheId(), GridDhtPartitionDemandMessage.class, new CI2<UUID, GridDhtPartitionDemandMessage>() { + @Override public void apply(UUID id, GridDhtPartitionDemandMessage m) { + processOldDemandMessage(m, id); + } + }); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/73ffae4b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index b563c15..6107daa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -191,6 +191,9 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { demander = new GridDhtPartitionDemander(cctx, demandLock); cctx.events().addListener(discoLsnr, EVT_NODE_JOINED, EVT_NODE_LEFT, EVT_NODE_FAILED); + + supplier.start(); + demander.start(); } /** {@inheritDoc} */ @@ -207,9 +210,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { final long startTopVer = loc.order(); topVer.setIfGreater(startTopVer); - - supplier.start(); - demander.start(); } /** {@inheritDoc} */ @@ -230,6 +230,11 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { cctx.events().removeListener(discoLsnr); + top = null; + } + + /** {@inheritDoc} */ + @Override public void stop() { // Acquire write busy lock. busyLock.writeLock().lock(); @@ -238,8 +243,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { if (demander != null) demander.stop(); - - top = null; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/73ffae4b/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 7c72662..f752b0e 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 @@ -104,7 +104,7 @@ public class GridCacheRebalancingSyncSelfTest extends GridCommonAbstractTest { cacheRCfg.setCacheMode(CacheMode.REPLICATED); cacheRCfg.setRebalanceMode(CacheRebalanceMode.SYNC); cacheRCfg.setRebalanceBatchSize(1); - cacheRCfg.setRebalanceBatchesCount(/**Integer.MAX_VALUE*/1);// Disabled because of SHMEM fails. + cacheRCfg.setRebalanceBatchesCount(Integer.MAX_VALUE); CacheConfiguration<Integer, Integer> cacheRCfg2 = new CacheConfiguration<>();
