Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3F33A200498 for ; Tue, 29 Aug 2017 16:38:19 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3D46C166C5D; Tue, 29 Aug 2017 14:38:19 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 16BC3166C54 for ; Tue, 29 Aug 2017 16:38:17 +0200 (CEST) Received: (qmail 75019 invoked by uid 500); 29 Aug 2017 14:38:17 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 74528 invoked by uid 99); 29 Aug 2017 14:38:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Aug 2017 14:38:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6CAC5F5FA9; Tue, 29 Aug 2017 14:38:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agura@apache.org To: commits@ignite.apache.org Date: Tue, 29 Aug 2017 14:38:25 -0000 Message-Id: <72187a83d8ff4ff384d8885e5ed7ad69@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/16] ignite git commit: Increment GridDhtPartitionMap update sequence when assign new state on coordinator. archived-at: Tue, 29 Aug 2017 14:38:19 -0000 Increment GridDhtPartitionMap update sequence when assign new state on coordinator. Signed-off-by: Andrey Gura Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df4969b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df4969b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df4969b8 Branch: refs/heads/master Commit: df4969b8641886fcc14c3259753ddbbd34cd666e Parents: f8e7549 Author: sboikov Authored: Fri Aug 25 17:50:01 2017 +0300 Committer: Andrey Gura Committed: Tue Aug 29 17:32:04 2017 +0300 ---------------------------------------------------------------------- .../dht/GridDhtPartitionTopologyImpl.java | 18 ++++++++++++------ .../IgnitePdsCacheRebalancingAbstractTest.java | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df4969b8/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 f25ae21..87b3670 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 @@ -1186,7 +1186,9 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { lock.writeLock().lock(); try { - if (stopping || !lastTopChangeVer.initialized()) + if (stopping || !lastTopChangeVer.initialized() || + // Ignore message not-related to exchange if exchange is in progress. + (exchangeVer == null && !lastTopChangeVer.equals(readyTopVer))) return false; if (incomeCntrMap != null) { @@ -1909,20 +1911,24 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { } for (Map.Entry e : node2part.entrySet()) { - if (!e.getValue().containsKey(p)) + GridDhtPartitionMap partMap = e.getValue(); + + if (!partMap.containsKey(p)) continue; - if (e.getValue().get(p) == OWNING && !owners.contains(e.getKey())) { + if (partMap.get(p) == OWNING && !owners.contains(e.getKey())) { if (haveHistory) - e.getValue().put(p, MOVING); + partMap.put(p, MOVING); else { - e.getValue().put(p, RENTING); + partMap.put(p, RENTING); result.add(e.getKey()); } + partMap.updateSequence(partMap.updateSequence() + 1, partMap.topologyVersion()); + U.warn(log, "Partition has been scheduled for rebalancing due to outdated update counter " + - "[nodeId=" + ctx.localNodeId() + ", cacheOrGroupName=" + grp.cacheOrGroupName() + + "[nodeId=" + e.getKey() + ", cacheOrGroupName=" + grp.cacheOrGroupName() + ", partId=" + p + ", haveHistory=" + haveHistory + "]"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/df4969b8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java index 91838fc..7b047f8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java @@ -512,6 +512,8 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb Integer val = 0; for (int i = 0; i < 5; i++) { + info("Iteration: " + i); + Integer key = primaryKey(ignite(3).cache(cacheName)); c.put(key, val);