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 E78E117A01 for ; Mon, 6 Apr 2015 12:35:13 +0000 (UTC) Received: (qmail 51155 invoked by uid 500); 6 Apr 2015 12:35:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51118 invoked by uid 500); 6 Apr 2015 12:35:13 -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 51109 invoked by uid 99); 6 Apr 2015 12:35:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 12:35:13 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Apr 2015 12:34:50 +0000 Received: (qmail 50667 invoked by uid 99); 6 Apr 2015 12:34:47 -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; Mon, 06 Apr 2015 12:34:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6AA3DE10AC; Mon, 6 Apr 2015 12:34:47 +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: Mon, 06 Apr 2015 12:34:50 -0000 Message-Id: <5234bd83e9954cc2a74d94cd82a83de5@git.apache.org> In-Reply-To: <5e77615e8574469d87b1a49e9350b8ac@git.apache.org> References: <5e77615e8574469d87b1a49e9350b8ac@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/11] incubator-ignite git commit: #ignite-gg-9966: Move ATTR_BUILD_VER to NodeValidator X-Virus-Checked: Checked by ClamAV on apache.org #ignite-gg-9966: Move ATTR_BUILD_VER to NodeValidator Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9aec2293 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9aec2293 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9aec2293 Branch: refs/heads/ignite-sprint-3 Commit: 9aec2293867db375e85d0712bed7e2036b4032aa Parents: 4f4772f Author: ivasilinets Authored: Fri Apr 3 11:32:50 2015 +0300 Committer: ivasilinets Committed: Fri Apr 3 11:32:50 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 1 - .../ignite/internal/processors/spi/OsNodeValidator.java | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aec2293/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 530613d..4e40ef1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1157,7 +1157,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { // Stick in some system level attributes add(ATTR_JIT_NAME, U.getCompilerMx() == null ? "" : U.getCompilerMx().getName()); - add(ATTR_BUILD_VER, VER_STR); add(ATTR_BUILD_DATE, BUILD_TSTAMP_STR); add(ATTR_MARSHALLER, cfg.getMarshaller().getClass().getName()); add(ATTR_USER_NAME, System.getProperty("user.name")); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aec2293/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeValidator.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeValidator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeValidator.java index 0b678df..923d0ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeValidator.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/spi/OsNodeValidator.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.spi; +import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; @@ -26,6 +27,7 @@ import org.apache.ignite.spi.*; import org.jetbrains.annotations.*; import static org.apache.ignite.internal.IgniteNodeAttributes.*; +import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR; /** * Node validator. @@ -39,6 +41,11 @@ public class OsNodeValidator extends GridProcessorAdapter implements NodeValidat } /** {@inheritDoc} */ + @Override public void start() throws IgniteCheckedException { + ctx.addNodeAttribute(ATTR_BUILD_VER, VER_STR); + } + + /** {@inheritDoc} */ @Nullable @Override public IgniteSpiNodeValidationResult validateNode(ClusterNode node) { ClusterNode locNode = ctx.discovery().localNode();