Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9D58E18C44 for ; Thu, 21 May 2015 07:53:16 +0000 (UTC) Received: (qmail 34263 invoked by uid 500); 21 May 2015 07:53:16 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 34233 invoked by uid 500); 21 May 2015 07:53:16 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 34224 invoked by uid 99); 21 May 2015 07:53:16 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2015 07:53:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 1CF3AC7265 for ; Thu, 21 May 2015 07:53:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.771 X-Spam-Level: X-Spam-Status: No, score=0.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id NIx3cMuQ5oIa for ; Thu, 21 May 2015 07:53:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 21F4B48492 for ; Thu, 21 May 2015 07:53:02 +0000 (UTC) Received: (qmail 31619 invoked by uid 99); 21 May 2015 07:53:01 -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; Thu, 21 May 2015 07:53:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0426ADFF5D; Thu, 21 May 2015 07:53:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 21 May 2015 07:53:27 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [28/28] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23 Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12761e44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12761e44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12761e44 Branch: refs/heads/ignite-23 Commit: 12761e44013e51cf2fb787ec0d7edf6cd6cc1fd8 Parents: d299316 Author: sboikov Authored: Thu May 21 10:12:42 2015 +0300 Committer: sboikov Committed: Thu May 21 10:19:27 2015 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignmentCache.java | 2 ++ .../internal/processors/cache/GridCacheAffinityManager.java | 1 + .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 9 +-------- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12761e44/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 18ac65a..2992a6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -103,6 +103,8 @@ public class GridAffinityAssignmentCache { } /** + * Copies previous affinity assignment when client node joins on leaves. + * * @param node Node. * @param topVer Topology version. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12761e44/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java index 6541e9a..20fca7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java @@ -149,6 +149,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { } /** + * Copies previous affinity assignment when client node joins on leaves. * * @param node Node. * @param topVer Topology version. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12761e44/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 5a5c490..9315b28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1045,13 +1045,6 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { } ClusterNode node = ctx.discovery().node(nodeId); - // Do not check topology version for CLOCK versioning since - // partition exchange will wait for near update future. - // Also do not check topology version if topology was locked on near node by - // external transaction or explicit lock. - if (topology().topologyVersion().equals(req.topologyVersion()) || req.topologyLocked() || - ctx.config().getAtomicWriteOrderMode() == CLOCK) { - ClusterNode node = ctx.discovery().node(nodeId); if (node == null) { U.warn(log, "Node originated update request left grid: " + nodeId); @@ -1168,7 +1161,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { } } catch (GridDhtInvalidPartitionException ignore) { - assert !req.fastMap() || clientReq; + assert !req.fastMap() || clientReq : req; if (log.isDebugEnabled()) log.debug("Caught invalid partition exception for cache entry (will remap update request): " + req);