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 CFD3B200D14 for ; Tue, 3 Oct 2017 15:42:12 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CE7741609DD; Tue, 3 Oct 2017 13:42:12 +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 1EA421609D2 for ; Tue, 3 Oct 2017 15:42:11 +0200 (CEST) Received: (qmail 78238 invoked by uid 500); 3 Oct 2017 13:42:11 -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 78229 invoked by uid 99); 3 Oct 2017 13:42:11 -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, 03 Oct 2017 13:42:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0A7BAF5715; Tue, 3 Oct 2017 13:42:11 +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: <01cf93ecbd8949f6868fd974fd588a45@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: Fixed affinityReadyFuture to use actual for result. Date: Tue, 3 Oct 2017 13:42:11 +0000 (UTC) archived-at: Tue, 03 Oct 2017 13:42:13 -0000 Repository: ignite Updated Branches: refs/heads/master b21f750f7 -> db69e9027 Fixed affinityReadyFuture to use actual for result. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/db69e902 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/db69e902 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/db69e902 Branch: refs/heads/master Commit: db69e90279d05ea980cf33ab4230c2c9d4dd2c01 Parents: b21f750 Author: sboikov Authored: Tue Oct 3 16:42:01 2017 +0300 Committer: sboikov Committed: Tue Oct 3 16:42:01 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/affinity/GridAffinityAssignmentCache.java | 2 +- .../ignite/internal/processors/cache/GridCacheAffinityManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/db69e902/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 f921251..cbc4eae 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 @@ -392,7 +392,7 @@ public class GridAffinityAssignmentCache { log.debug("Completing topology ready future right away [head=" + aff.topologyVersion() + ", topVer=" + topVer + ']'); - fut.onDone(topVer); + fut.onDone(aff.topologyVersion()); } else if (stopErr != null) fut.onDone(stopErr); http://git-wip-us.apache.org/repos/asf/ignite/blob/db69e902/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 702b848..fbe1a95 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 @@ -99,7 +99,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { IgniteInternalFuture fut = aff.readyFuture(topVer); - return fut != null ? fut : new GridFinishedFuture<>(topVer); + return fut != null ? fut : cctx.shared().exchange().lastFinishedFuture(); } /**