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 C57D218DF5 for ; Tue, 15 Dec 2015 07:33:09 +0000 (UTC) Received: (qmail 54777 invoked by uid 500); 15 Dec 2015 07:33:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54741 invoked by uid 500); 15 Dec 2015 07:33:09 -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 54732 invoked by uid 99); 15 Dec 2015 07:33:09 -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, 15 Dec 2015 07:33:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4484ADFFB6; Tue, 15 Dec 2015 07:33:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: <958aad392ee941c38d10289868c65a4a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1.5 Date: Tue, 15 Dec 2015 07:33:09 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1537 dc7e33c8b -> cf4d0daf2 ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cf4d0daf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cf4d0daf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cf4d0daf Branch: refs/heads/ignite-1537 Commit: cf4d0daf25db953e8280341325f2d1e20686395b Parents: dc7e33c Author: sboikov Authored: Tue Dec 15 10:32:59 2015 +0300 Committer: sboikov Committed: Tue Dec 15 10:32:59 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/dht/GridDhtCacheAdapter.java | 7 ++++++- .../cache/distributed/dht/GridPartitionedSingleGetFuture.java | 7 ++++--- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/cf4d0daf/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 9199e70..9cf8084 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 @@ -775,9 +775,14 @@ public abstract class GridDhtCacheAdapter extends GridDistributedCacheAdap res.setContainsValue(); } else { + AffinityTopologyVersion topVer = ctx.shared().exchange().readyAffinityVersion(); + + assert topVer.compareTo(req.topologyVersion()) >= 0 : "Wrong ready topology version for " + + "invalid partitions response [topVer=" + topVer + ", req=" + req + ']'; + res = new GridNearSingleGetResponse(ctx.cacheId(), req.futureId(), - ctx.shared().exchange().readyAffinityVersion(), + topVer, null, true, req.addDeploymentInfo()); http://git-wip-us.apache.org/repos/asf/ignite/blob/cf4d0daf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java index f3f225a..5d0814f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java @@ -191,8 +191,6 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter im */ @SuppressWarnings("unchecked") private void map(AffinityTopologyVersion topVer) { - this.topVer = topVer; - ClusterNode node = mapKeyToNode(topVer); if (node == null) { @@ -250,6 +248,9 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter im } else { synchronized (this) { + assert this.node == null; + + this.topVer = topVer; this.node = node; } @@ -325,7 +326,7 @@ public class GridPartitionedSingleGetFuture extends GridFutureAdapter im GridDhtCacheAdapter colocated = cctx.dht(); while (true) { - GridCacheEntryEx entry = null; + GridCacheEntryEx entry; try { entry = colocated.context().isSwapOrOffheapEnabled() ? colocated.entryEx(key) :