ignite-10044
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a035199 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a035199 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a035199 Branch: refs/heads/ignite-10044 Commit: 9a0351994a93d5baa5d53035a3c1b04963a58797 Parents: a246886 Author: sboikov <sboi...@apache.org> Authored: Fri Nov 16 15:41:43 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Fri Nov 16 15:41:43 2018 +0300 ---------------------------------------------------------------------- .../dht/topology/GridDhtPartitionTopologyImpl.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9a035199/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java index eabb9b0..b966eca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java @@ -1563,12 +1563,6 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { changed = true; } - else if (state == LOST && exchangeVer.equals(grp.localStartVersion())) { - if (lostParts == null) - lostParts = new TreeSet<>(); - - lostParts.add(p); - } } } @@ -2256,8 +2250,12 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { if (e.getKey().equals(ctx.localNodeId())) continue; - for (Integer part : lostParts) - e.getValue().put(part, LOST); + for (Integer part : lostParts) { + GridDhtPartitionState state = e.getValue().get(part); + + if (state != null && state.active()) + e.getValue().put(part, LOST); + } } }
