Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 45711200B86 for ; Thu, 11 Aug 2016 05:33:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 445F8160AB2; Thu, 11 Aug 2016 03:33:21 +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 6E6AB160AC0 for ; Thu, 11 Aug 2016 05:33:20 +0200 (CEST) Received: (qmail 63368 invoked by uid 500); 11 Aug 2016 03:33:14 -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 62735 invoked by uid 99); 11 Aug 2016 03:33:14 -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, 11 Aug 2016 03:33:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3CE5ED22A; Thu, 11 Aug 2016 03:33:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anovikov@apache.org To: commits@ignite.apache.org Date: Thu, 11 Aug 2016 03:33:28 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [16/19] ignite git commit: Fixed checks for client mode + daemon mode. archived-at: Thu, 11 Aug 2016 03:33:21 -0000 Fixed checks for client mode + daemon mode. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/317a6750 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/317a6750 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/317a6750 Branch: refs/heads/master Commit: 317a675095d96ce158dd66c1739107a2e18cfc8c Parents: 8bf0a48 Author: Alexey Kuznetsov Authored: Wed Aug 10 17:44:59 2016 +0700 Committer: Alexey Kuznetsov Committed: Wed Aug 10 17:44:59 2016 +0700 ---------------------------------------------------------------------- .../internal/managers/discovery/GridDiscoveryManager.java | 3 ++- .../apache/ignite/internal/visor/util/VisorTaskUtils.java | 8 ++++++++ .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/317a6750/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 bbf3ebd..2a47ca2 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 @@ -2225,7 +2225,8 @@ public class GridDiscoveryManager extends GridManagerAdapter { if (log.isInfoEnabled()) log.info("Client node reconnected to topology: " + node); - ackTopology(topVer.topologyVersion(), true); + if (!isLocDaemon) + ackTopology(topVer.topologyVersion(), true); break; } http://git-wip-us.apache.org/repos/asf/ignite/blob/317a6750/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java index 7eebbf1..2721be4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java @@ -1024,4 +1024,12 @@ public class VisorTaskUtils { return bos.toByteArray(); } + + /** + * @param msg Exception message. + * @return {@code true} if node failed to join grid. + */ + public static boolean joinTimedOut(String msg) { + return msg != null && msg.startsWith("Join process timed out."); + } } http://git-wip-us.apache.org/repos/asf/ignite/blob/317a6750/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 9821134..4230a26 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -2018,15 +2018,19 @@ class ClientImpl extends TcpDiscoveryImpl { Map cacheMetrics, long tstamp) { + boolean isLocDaemon = spi.locNode.isDaemon(); + assert nodeId != null; assert metrics != null; - assert cacheMetrics != null; + assert isLocDaemon || cacheMetrics != null; TcpDiscoveryNode node = nodeId.equals(getLocalNodeId()) ? locNode : rmtNodes.get(nodeId); if (node != null && node.visible()) { node.setMetrics(metrics); - node.setCacheMetrics(cacheMetrics); + + if (!isLocDaemon) + node.setCacheMetrics(cacheMetrics); node.lastUpdateTime(tstamp);