Repository: incubator-ignite Updated Branches: refs/heads/ignite-901 256fa115d -> c44e30b72
# ignite-901 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c44e30b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c44e30b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c44e30b7 Branch: refs/heads/ignite-901 Commit: c44e30b72e4c18b624b99e2406182c51d14ce412 Parents: 256fa11 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jul 14 15:34:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jul 14 15:34:56 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridDhtCacheAdapter.java | 4 ++-- .../dht/GridDhtPartitionTopologyImpl.java | 24 ++++++++++++++++++++ .../dht/preloader/GridDhtPreloader.java | 2 -- 3 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c44e30b7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 90497b3..f70597d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -51,7 +51,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap private static final long serialVersionUID = 0L; /** Topology. */ - private GridDhtPartitionTopology top; + private GridDhtPartitionTopologyImpl top; /** Preloader. */ protected GridCachePreloader preldr; @@ -137,7 +137,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap @Override public void onReconnected() { super.onReconnected(); - top = new GridDhtPartitionTopologyImpl(ctx); + top.onReconnected(); if (preldr != null) preldr.onReconnected(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c44e30b7/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 de7f876..facf329 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 @@ -94,6 +94,30 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { } /** + * + */ + public void onReconnected() { + lock.writeLock().lock(); + + try { + node2part = null; + + part2node = new HashMap<>(); + + lastExchangeId = null; + + updateSeq.set(1); + + topReadyFut = null; + + topVer = AffinityTopologyVersion.NONE; + } + finally { + lock.writeLock().unlock(); + } + } + + /** * @return Full map string representation. */ @SuppressWarnings( {"ConstantConditions"}) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c44e30b7/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 5b2a14a..a43ebe2 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 @@ -241,8 +241,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { /** {@inheritDoc} */ @Override public void onReconnected() { startFut = new GridFutureAdapter<>(); - - top = cctx.dht().topology(); } /** {@inheritDoc} */
