From commits-return-116674-archive-asf-public=cust-asf.ponee.io@ignite.apache.org Wed Jan 24 16:01:48 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 8F007180799 for ; Wed, 24 Jan 2018 16:01:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7F9C1160C3C; Wed, 24 Jan 2018 15:01:48 +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 A69EF160C51 for ; Wed, 24 Jan 2018 16:01:47 +0100 (CET) Received: (qmail 8847 invoked by uid 500); 24 Jan 2018 15:01:46 -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 8748 invoked by uid 99); 24 Jan 2018 15:01:46 -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; Wed, 24 Jan 2018 15:01:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C529F2178; Wed, 24 Jan 2018 15:01:46 +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: Wed, 24 Jan 2018 15:01:50 -0000 Message-Id: <4fccf22f7d9c46d3b231fbbdc7b2bc00@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [05/11] ignite git commit: master Add a method to quickly check if a node is in baseline topology master Add a method to quickly check if a node is in baseline topology Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa156452 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa156452 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa156452 Branch: refs/heads/ignite-6643 Commit: fa1564522cc544ffcff7e22e6af2cf19dea53ae5 Parents: 8d42789 Author: Alexey Goncharuk Authored: Wed Jan 24 10:46:34 2018 +0300 Committer: Alexey Goncharuk Committed: Wed Jan 24 10:46:34 2018 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/DiscoCache.java | 8 ++++++++ .../processors/cache/persistence/file/FilePageStore.java | 2 +- .../processors/cluster/GridClusterStateProcessor.java | 10 ++++++---- 3 files changed, 15 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa156452/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java index f73f420..7bc0344 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java @@ -276,6 +276,14 @@ public class DiscoCache { } /** + * @param node Node to check. + * @return {@code True} if the node is in baseline or if baseline is not set. + */ + public boolean baselineNode(ClusterNode node) { + return nodeIdToConsIdx == null || nodeIdToConsIdx.get(node.id()) != null; + } + + /** * @return Oldest alive server node. */ @SuppressWarnings("ForLoopReplaceableByForEach") http://git-wip-us.apache.org/repos/asf/ignite/blob/fa156452/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java index ddf6062..1153c88 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStore.java @@ -126,7 +126,7 @@ public class FilePageStore implements PageStore { /** * Page store version. */ - public int version() { + @Override public int version() { return VERSION; } http://git-wip-us.apache.org/repos/asf/ignite/blob/fa156452/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 54e0f56..73c9d7f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -243,12 +243,14 @@ public class GridClusterStateProcessor extends GridProcessorAdapter implements I * @throws IgniteCheckedException If write to metastore has failed. */ public void resetBranchingHistory(long newBranchingHash) throws IgniteCheckedException { - globalState.baselineTopology().resetBranchingHistory(newBranchingHash); + if (!compatibilityMode()) { + globalState.baselineTopology().resetBranchingHistory(newBranchingHash); - writeBaselineTopology(globalState.baselineTopology(), null); + writeBaselineTopology(globalState.baselineTopology(), null); - U.log(log, - String.format("Branching history of current BaselineTopology is reset to the value %d", newBranchingHash)); + U.log(log, + String.format("Branching history of current BaselineTopology is reset to the value %d", newBranchingHash)); + } } /**