Repository: incubator-ignite Updated Branches: refs/heads/ignite-yardstick-client e762044e8 -> 46b94c4b3
# add logging Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46b94c4b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46b94c4b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46b94c4b Branch: refs/heads/ignite-yardstick-client Commit: 46b94c4b30c18d9e6e07e39290ef6f91c8745ce9 Parents: e762044 Author: sboikov <sboi...@gridgain.com> Authored: Wed Jun 24 17:45:33 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Jun 24 17:50:23 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 12 +++++++++--- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 9 ++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46b94c4b/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 7961a71..a806d82 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 @@ -801,10 +801,12 @@ class ClientImpl extends TcpDiscoveryImpl { catch (IOException e) { msgWorker.addMessage(new SocketClosedMessage(sock)); - if (log.isDebugEnabled()) + //if (log.isDebugEnabled()) U.error(log, "Connection failed [sock=" + sock + ", locNodeId=" + getLocalNodeId() + ']', e); } finally { + U.error(log, "Closing socket [sock=" + sock + ", locNodeId=" + getLocalNodeId() + ']'); + U.closeQuiet(sock); synchronized (mux) { @@ -904,7 +906,7 @@ class ClientImpl extends TcpDiscoveryImpl { msg = null; } catch (IOException e) { - if (log.isDebugEnabled()) + //if (log.isDebugEnabled()) U.error(log, "Failed to send node left message (will stop anyway) " + "[sock=" + sock + ", msg=" + msg + ']', e); @@ -1006,6 +1008,8 @@ class ClientImpl extends TcpDiscoveryImpl { if (res.creatorNodeId().equals(getLocalNodeId())) { if (res.success()) { + log.info("Reconnected [loc=" + getLocalNodeId() + ']'); + msgWorker.addMessage(res); if (msgs != null) { @@ -1104,6 +1108,8 @@ class ClientImpl extends TcpDiscoveryImpl { try { final Socket sock = joinTopology(false, spi.joinTimeout); + log.info("Joined [loc=" + getLocalNodeId() + ", sock=" + sock + ']'); + if (sock == null) { joinError(new IgniteSpiException("Join process timed out.")); @@ -1132,7 +1138,7 @@ class ClientImpl extends TcpDiscoveryImpl { if (joinLatch.getCount() > 0) { joinError(new IgniteSpiException("Join process timed out, did not receive response for " + "join request (consider increasing 'joinTimeout' configuration property) " + - "[joinTimeout=" + spi.joinTimeout + ", sock=" + sock +']')); + "[joinTimeout=" + spi.joinTimeout + ", sock=" + sock + ']')); break; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46b94c4b/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 04b0a1a..f959379 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 @@ -4623,13 +4623,20 @@ class ServerImpl extends TcpDiscoveryImpl { prepareNodeAddedMessage(msg, clientNodeId, null, null); writeToSocket(sock, msg); + + if (msg instanceof TcpDiscoveryNodeAddFinishedMessage) { + TcpDiscoveryNodeAddFinishedMessage msg0 = (TcpDiscoveryNodeAddFinishedMessage)msg; + + if (clientNodeId.equals(msg0.nodeId())) + log.info("Sent TcpDiscoveryNodeAddFinishedMessage to client: " + clientNodeId); + } } finally { clearNodeAddedMessage(msg); } } catch (IgniteCheckedException | IOException e) { - if (log.isDebugEnabled()) + //if (log.isDebugEnabled()) U.error(log, "Client connection failed [sock=" + sock + ", locNodeId=" + getLocalNodeId() + ", rmtNodeId=" + clientNodeId + ", msg=" + msg + ']', e);
