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 5334D174BF for ; Tue, 21 Apr 2015 20:42:22 +0000 (UTC) Received: (qmail 88367 invoked by uid 500); 21 Apr 2015 20:42:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 88336 invoked by uid 500); 21 Apr 2015 20:42:22 -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 88327 invoked by uid 99); 21 Apr 2015 20:42:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2015 20:42:22 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2015 20:42:17 +0000 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 1C53943E5C for ; Tue, 21 Apr 2015 20:41:57 +0000 (UTC) Received: (qmail 87203 invoked by uid 99); 21 Apr 2015 20:41:56 -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, 21 Apr 2015 20:41:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 869B8E0922; Tue, 21 Apr 2015 20:41:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sevdokimov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <5276c544a6534a649926c88cd1938a87@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: # IGNITE-709 Bug fix: update GridDiscoveryManager.topSnap correctly. Date: Tue, 21 Apr 2015 20:41:56 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-709 df24fbdf0 -> 4e57b644e # IGNITE-709 Bug fix: update GridDiscoveryManager.topSnap correctly. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4e57b644 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4e57b644 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4e57b644 Branch: refs/heads/ignite-709 Commit: 4e57b644e494e0a338503aee608482b9e3bb1de9 Parents: df24fbd Author: sevdokimov Authored: Tue Apr 21 23:41:45 2015 +0300 Committer: sevdokimov Committed: Tue Apr 21 23:41:45 2015 +0300 ---------------------------------------------------------------------- .../managers/discovery/GridDiscoveryManager.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e57b644/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 11fa261..ec4d54f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -390,11 +390,15 @@ public class GridDiscoveryManager extends GridManagerAdapter { discoCacheHist.put(nextTopVer, cache); - boolean set = updateTopologyVersionIfGreater(nextTopVer, cache); - - assert set || topVer == 0 : "Topology version has not been updated [this.topVer=" + - topSnap + ", topVer=" + topVer + ", node=" + node + - ", evt=" + U.gridEventName(type) + ']'; + if (type == EVT_NODE_JOINED && locNode.equals(node)) + topSnap.set(new Snapshot(nextTopVer, cache)); + else { + boolean set = updateTopologyVersionIfGreater(nextTopVer, cache); + + assert set || topVer == 0 : "Topology version has not been updated [this.topVer=" + + topSnap + ", topVer=" + topVer + ", node=" + node + + ", evt=" + U.gridEventName(type) + ']'; + } } // If this is a local join event, just save it and do not notify listeners.