You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/04/06 17:47:27 UTC
[04/24] incubator-ignite git commit: #ignite-gg-9966: Move
ATTR_BUILD_VER to NodeValidator
#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-593
Commit: 9aec2293867db375e85d0712bed7e2036b4032aa
Parents: 4f4772f
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Apr 3 11:32:50 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
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();