ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 1093
Date Fri, 16 Oct 2015 19:16:14 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1093-2 8b8ee04ea -> c4b65e16b


1093


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4b65e16
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4b65e16
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4b65e16

Branch: refs/heads/ignite-1093-2
Commit: c4b65e16b78accdb3edad68e63c606d4a834070f
Parents: 8b8ee04
Author: Anton Vinogradov <avinogradov@gridgain.com>
Authored: Fri Oct 16 22:15:22 2015 +0300
Committer: Anton Vinogradov <avinogradov@gridgain.com>
Committed: Fri Oct 16 22:15:22 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionSupplier.java          | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/c4b65e16/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 cb70e90..26a6a8c 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
@@ -34,7 +34,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryInfo;
 import org.apache.ignite.internal.processors.cache.GridCacheEntryInfoCollectSwapListener;
-import org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager;
 import org.apache.ignite.internal.processors.cache.GridCacheSwapEntry;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
 import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
@@ -195,11 +194,10 @@ class GridDhtPartitionSupplier {
             if (cutTop.compareTo(demTop) < 0)
                 // Resend demand message.
                 try {
-                    cctx.io().sendOrderedMessage(cctx.localNode(), GridCachePartitionExchangeManager.rebalanceTopic(idx),
-                        d, cctx.ioPolicy(), cctx.config().getRebalanceTimeout());
-
-                    log.info("Demand request resended [current=" + cutTop + ", demanded="
+ demTop +
+                    log.info("Demand request caused waiting for proper topology [current="
+ cutTop + ", demanded=" + demTop +
                         ", from=" + id + ", idx=" + idx + "]");
+
+                    cctx.discovery().topologyFuture(demTop.topologyVersion()).get();
                 }
                 catch (IgniteCheckedException e) {
                     U.error(log, "Failed to resend partition supply message to local node:
" + cctx.localNode().id());
@@ -261,9 +259,6 @@ 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;


Mime
View raw message