Repository: incubator-ignite Updated Branches: refs/heads/ignite-yardstick-client a7eb54015 -> 87c7df790
#ignite client. Added logs. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/87c7df79 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/87c7df79 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/87c7df79 Branch: refs/heads/ignite-yardstick-client Commit: 87c7df790335c28b32f8b17bdb9d989a5f00f910 Parents: a7eb540 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Jun 22 12:24:26 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Jun 22 12:24:26 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ClientImpl.java | 3 +++ .../ignite/spi/discovery/tcp/ServerImpl.java | 27 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c7df79/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 6b2efc1..77d7160 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 @@ -339,6 +339,9 @@ class ClientImpl extends TcpDiscoveryImpl { ClusterNode node = rmtNodes.get(nodeId); if (node != null) { + U.debug(log, "ClientImpl.failNode. [nodeId = "+ nodeId +", localNodeId = " + getLocalNodeId() + + ", msg = " + warning + "]"); + TcpDiscoveryNodeFailedMessage msg = new TcpDiscoveryNodeFailedMessage(getLocalNodeId(), node.id(), node.order()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87c7df79/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 2458f85..04b0a1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -588,6 +588,9 @@ class ServerImpl extends TcpDiscoveryImpl { ClusterNode node = ring.node(nodeId); if (node != null) { + U.debug(log, "ServerImpl.failNode. [nodeId = "+ nodeId +", localNodeId = " + getLocalNodeId() + + ", msg = " + warning + "]"); + TcpDiscoveryNodeFailedMessage msg = new TcpDiscoveryNodeFailedMessage(getLocalNodeId(), node.id(), node.order()); @@ -1300,9 +1303,13 @@ class ServerImpl extends TcpDiscoveryImpl { next = ring.nextNode(failedNodes); } - if (next != null) + if (next != null) { + U.debug(log, "ServerImpl.forceNextNodeFailure(). [nextNodeId = "+ next.id() +", localNodeId = " + + getLocalNodeId() + "]"); + msgWorker.addMessage(new TcpDiscoveryNodeFailedMessage(getLocalNodeId(), next.id(), next.internalOrder())); + } } /** @@ -2327,8 +2334,12 @@ class ServerImpl extends TcpDiscoveryImpl { ServerImpl.this.failedNodes.addAll(failedNodes); } - for (TcpDiscoveryNode n : failedNodes) + for (TcpDiscoveryNode n : failedNodes) { + U.debug(log, "ServerImpl.sendMessageAcrossRing(TcpDiscoveryAbstractMessage). " + + "[nodeId = " + n.id() + ", localNodeId = " + locNodeId + "]"); + msgWorker.addMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, n.id(), n.internalOrder())); + } LT.warn(log, null, "Local node has detected failed nodes and started cluster-wide procedure. " + "To speed up failure detection please see 'Failure Detection' section under javadoc" + @@ -2422,6 +2433,9 @@ class ServerImpl extends TcpDiscoveryImpl { if (existingNode != null) { if (!node.socketAddresses().equals(existingNode.socketAddresses())) { if (!pingNode(existingNode)) { + U.debug(log, "ServerImpl.processJoinRequestMessage(TcpDiscoveryJoinRequestMessage). " + + "[nodeId = " + existingNode.id() + ", localNodeId = " + locNodeId + "]"); + addMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, existingNode.id(), existingNode.internalOrder())); @@ -2750,6 +2764,9 @@ class ServerImpl extends TcpDiscoveryImpl { log.debug("Failing reconnecting client node because failed to restore pending " + "messages [locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); + U.debug(log, "ServerImpl.processClientReconnectMessage(TcpDiscoveryClientReconnectMessage). " + + "[nodeId = "+ node.id() +", localNodeId = " + locNodeId + "]"); + processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, node.id(), node.internalOrder())); } @@ -2897,6 +2914,9 @@ class ServerImpl extends TcpDiscoveryImpl { "[node=" + node + ", err=" + e.getMessage() + ']', e); } + U.debug(log, "ServerImpl.processNodeAddedMessage(TcpDiscoveryNodeAddedMessage). Auth fail" + + "[nodeId = " + node.id() + ", localNodeId = " + locNodeId + "]"); + addMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, node.id(), node.internalOrder())); } @@ -3649,6 +3669,9 @@ class ServerImpl extends TcpDiscoveryImpl { int aliveCheck = clientNode.decrementAliveCheck(); if (aliveCheck == 0 && isLocalNodeCoordinator()) { + U.debug(log, "ServerImpl.processHeartbeatMessage(TcpDiscoveryHeartbeatMessage). " + + "[nodeId = "+ clientNode.id() +", localNodeId = " + locNodeId + "]"); + processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, clientNode.id(), clientNode.internalOrder())); }
