You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/12 07:37:40 UTC
[03/11] ignite git commit: ignite-5075
ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e0e58786
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e0e58786
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e0e58786
Branch: refs/heads/ignite-5075
Commit: e0e587864b0b44e78eb6e3b16824018d67ab6086
Parents: d24b08b
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 11 17:48:26 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 11 17:48:26 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 2 +-
.../distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0e58786/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 58ad600..f16bb15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -393,7 +393,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
int num = cctx.affinity().partitions();
if (cctx.rebalanceEnabled()) {
- boolean added = exchId.topologyVersion().equals(cctx.startTopologyVersion());
+ boolean added = exchFut.isCacheAdded(cctx.cacheId(), exchId.topologyVersion());
boolean first = (loc.equals(oldest) && loc.id().equals(exchId.nodeId()) && exchId.isJoined()) || added;
http://git-wip-us.apache.org/repos/asf/ignite/blob/e0e58786/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 34235c0..7cec781 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -399,7 +399,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
*/
public boolean cacheStarted(int cacheId) {
return exchActions != null && exchActions.cacheStarted(cacheId);
-
}
/**