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 419EA172B1 for ; Thu, 16 Apr 2015 11:51:13 +0000 (UTC) Received: (qmail 56053 invoked by uid 500); 16 Apr 2015 11:51:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 56026 invoked by uid 500); 16 Apr 2015 11:51:00 -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 56017 invoked by uid 99); 16 Apr 2015 11:51:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2015 11:51:00 +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; Thu, 16 Apr 2015 11:50:38 +0000 Received: (qmail 55876 invoked by uid 99); 16 Apr 2015 11:50:36 -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; Thu, 16 Apr 2015 11:50:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EBB8AE09FB; Thu, 16 Apr 2015 11:50:35 +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: Thu, 16 Apr 2015 11:50:35 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] incubator-ignite git commit: ignite-754: implemented X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-754 [created] f6a08642a ignite-754: implemented Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bee6ac82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bee6ac82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bee6ac82 Branch: refs/heads/ignite-754 Commit: bee6ac82d6ed41dc7e5262c72100c7274a1e7880 Parents: 655514b Author: Denis Magda Authored: Thu Apr 16 13:53:51 2015 +0300 Committer: Denis Magda Committed: Thu Apr 16 13:53:51 2015 +0300 ---------------------------------------------------------------------- .../managers/discovery/GridDiscoveryManager.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bee6ac82/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 9f74b83..7b6edc2 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 @@ -738,11 +738,19 @@ public class GridDiscoveryManager extends GridManagerAdapter { Object locMode = locNode.attribute(ATTR_DEPLOYMENT_MODE); + int locJvmMajVer = nodeJavaMajorVer(locNode); + boolean locP2pEnabled = locNode.attribute(ATTR_PEER_CLASSLOADING); boolean warned = false; for (ClusterNode n : nodes) { + int rmtJvmMajVer = nodeJavaMajorVer(n); + + if (locJvmMajVer != rmtJvmMajVer) + throw new IgniteCheckedException("Local node's java major version = " + locJvmMajVer + + " is different from remote node's one = " + rmtJvmMajVer); + String rmtPreferIpV4 = n.attribute("java.net.preferIPv4Stack"); if (!F.eq(rmtPreferIpV4, locPreferIpV4)) { @@ -783,6 +791,14 @@ public class GridDiscoveryManager extends GridManagerAdapter { log.debug("Finished node attributes consistency check."); } + private int nodeJavaMajorVer(ClusterNode node) throws IgniteCheckedException { + try { + return Integer.parseInt(node.attribute("java.version").split(".")[1]); + } + catch (Exception e) { + throw new IgniteCheckedException("Failed to get java major version with reason: " + e.getMessage()); + } + } /** * @param nodes Nodes. * @return Total CPUs.