Repository: ignite Updated Branches: refs/heads/ignite-6467-1 9d0c46bd8 -> 9dad7d7a5
ignite-6467 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9dad7d7a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9dad7d7a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9dad7d7a Branch: refs/heads/ignite-6467-1 Commit: 9dad7d7a5bdc8eea61fd97020ddd9af0e304e09f Parents: 9d0c46b Author: sboikov <sboi...@apache.org> Authored: Mon Jul 30 10:01:11 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Mon Jul 30 10:01:11 2018 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9dad7d7a/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 1d1e1d8..3ee99db 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 @@ -1827,8 +1827,8 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { /** {@inheritDoc} */ @Override public void onExchangeDone(@Nullable GridDhtPartitionsExchangeFuture fut, - AffinityAssignment assignment, - boolean updateRebalanceVer) { + AffinityAssignment assignment, + boolean updateRebalanceVer) { lock.writeLock().lock(); try { @@ -1850,6 +1850,9 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { } else diffFromAffinityVer = readyTopVer; + + if (!updateRebalanceVer) + updateRebalanceVersion(assignment.topologyVersion(), assignment.assignment()); } if (updateRebalanceVer) @@ -2748,6 +2751,7 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { } /** + * @param affVer Affinity version. * @param aff Affinity assignments. */ private void updateRebalanceVersion(AffinityTopologyVersion affVer, List<List<ClusterNode>> aff) {
