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 2015/12/18 12:53:45 UTC
ignite git commit: ignite-1.5 Fixed client discovery impl to skip
discovery message processing while disconnected.
Repository: ignite
Updated Branches:
refs/heads/ignite-1537 d2c35503c -> a3f8678a4
ignite-1.5 Fixed client discovery impl to skip discovery message processing while disconnected.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a3f8678a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a3f8678a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a3f8678a
Branch: refs/heads/ignite-1537
Commit: a3f8678a40efe8871c39b8d2aec4230f82d97fcd
Parents: d2c3550
Author: sboikov <sb...@gridgain.com>
Authored: Fri Dec 18 14:47:06 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Dec 18 14:47:06 2015 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPreloader.java | 29 --------------------
1 file changed, 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a3f8678a/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 c46a66c..f0054e4 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
@@ -48,7 +48,6 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtFuture
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtInvalidPartitionException;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition;
import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
-import org.apache.ignite.internal.util.GridAtomicLong;
import org.apache.ignite.internal.util.future.GridCompoundFuture;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -92,9 +91,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** */
private GridDhtPartitionTopology top;
- /** Topology version. */
- private final GridAtomicLong topVer = new GridAtomicLong();
-
/** Force key futures. */
private final ConcurrentMap<IgniteUuid, GridDhtForceKeysFuture<?, ?>> forceKeyFuts = newMap();
@@ -149,11 +145,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
assert e.type() != EVT_NODE_JOINED || n.order() > loc.order() : "Node joined with smaller-than-local " +
"order [newOrder=" + n.order() + ", locOrder=" + loc.order() + ']';
- boolean set = topVer.setIfGreater(e.topologyVersion());
-
- assert set : "Have you configured TcpDiscoverySpi for your in-memory data grid? [newVer=" +
- e.topologyVersion() + ", curVer=" + topVer.get() + ", evt=" + e + ']';
-
if (e.type() == EVT_NODE_LEFT || e.type() == EVT_NODE_FAILED) {
for (GridDhtAssignmentFetchFuture fut : pendingAssignmentFetchFuts.values())
fut.onNodeLeft(e.eventNode().id());
@@ -238,20 +229,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
}
/** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- if (log.isDebugEnabled())
- log.debug("DHT rebalancer onKernalStart callback.");
-
- ClusterNode loc = cctx.localNode();
-
- assert loc.metrics().getStartTime() > 0;
-
- final long startTopVer = loc.order();
-
- topVer.setIfGreater(startTopVer);
- }
-
- /** {@inheritDoc} */
@Override public void preloadPredicate(IgnitePredicate<GridCacheEntryInfo> preloadPred) {
super.preloadPredicate(preloadPred);
@@ -382,12 +359,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** {@inheritDoc} */
@Override public void onReconnected() {
startFut = new GridFutureAdapter<>();
-
- long topVer0 = cctx.kernalContext().discovery().topologyVersion();
-
- assert topVer0 > 0 : topVer0;
-
- topVer.set(topVer0);
}
/**