You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/08/19 11:48:44 UTC
[27/53] [abbrv] ignite git commit: Fixed checks for client mode +
daemon mode.
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/ignite-3299
Commit: 317a675095d96ce158dd66c1739107a2e18cfc8c
Parents: 8bf0a48
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Aug 10 17:44:59 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
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<DiscoverySpi> {
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<Integer, CacheMetrics> 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);