Repository: incubator-ignite Updated Branches: refs/heads/ignite-yardstick-client-2 3fa39b19e -> 2d74b92b0
# timeout for first message read Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d74b92b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d74b92b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d74b92b Branch: refs/heads/ignite-yardstick-client-2 Commit: 2d74b92b0f7cfcfe707c2d3df2cc547231e3b148 Parents: 3fa39b1 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 25 11:01:36 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 25 11:01:36 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ClientImpl.java | 22 ++++++++++++++++---- .../ignite/spi/discovery/tcp/ServerImpl.java | 10 ++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d74b92b/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 4ba20dc..397038b 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 @@ -753,6 +753,8 @@ class ClientImpl extends TcpDiscoveryImpl { rmtNodeId = this.rmtNodeId; } + boolean first = joinLatch.getCount() > 0; + try { InputStream in = new BufferedInputStream(sock.getInputStream()); @@ -763,12 +765,17 @@ class ClientImpl extends TcpDiscoveryImpl { TcpDiscoveryAbstractMessage msg; try { - msg = spi.marsh.unmarshal(in, U.gridClassLoader()); + if (first) + msg = spi.readMessage(sock, in, spi.netTimeout); + else + msg = spi.marsh.unmarshal(in, U.gridClassLoader()); } catch (IgniteCheckedException e) { //if (log.isDebugEnabled()) U.error(log, "Failed to read message [sock=" + sock + ", " + - "locNodeId=" + getLocalNodeId() + ", rmtNodeId=" + rmtNodeId + ']', e); + "locNodeId=" + getLocalNodeId() + + ", rmtNodeId=" + rmtNodeId + + ", first=" + first + ']', e); IOException ioEx = X.cause(e, IOException.class); @@ -787,6 +794,9 @@ class ClientImpl extends TcpDiscoveryImpl { continue; } + finally { + first = false; + } msg.senderNodeId(rmtNodeId); @@ -805,10 +815,14 @@ class ClientImpl extends TcpDiscoveryImpl { msgWorker.addMessage(new SocketClosedMessage(sock)); //if (log.isDebugEnabled()) - U.error(log, "Connection failed [sock=" + sock + ", locNodeId=" + getLocalNodeId() + ']', e); + U.error(log, "Connection failed [sock=" + sock + + ", locNodeId=" + getLocalNodeId() + + ", first=" + first + ']', e); } finally { - U.error(log, "Closing socket [sock=" + sock + ", locNodeId=" + getLocalNodeId() + ']'); + U.error(log, "Closing socket [sock=" + sock + + ", locNodeId=" + getLocalNodeId() + + ", first="+ first + ']'); U.closeQuiet(sock); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d74b92b/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 76ddf75..eb58b1b 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 @@ -4657,7 +4657,15 @@ class ServerImpl extends TcpDiscoveryImpl { TcpDiscoveryNodeAddFinishedMessage msg0 = (TcpDiscoveryNodeAddFinishedMessage)msg; if (clientNodeId.equals(msg0.nodeId())) - log.info("Sent TcpDiscoveryNodeAddFinishedMessage to client: " + clientNodeId); + log.info("Sent TcpDiscoveryNodeAddFinishedMessage to client " + + "[client=" + clientNodeId + ", sock=" + sock + ']'); + } + else if (msg instanceof TcpDiscoveryClientReconnectMessage) { + TcpDiscoveryClientReconnectMessage msg0 = (TcpDiscoveryClientReconnectMessage)msg; + + if (clientNodeId.equals(msg0.creatorNodeId())) + log.info("Sent TcpDiscoveryClientReconnectMessage to client " + + "[client=" + clientNodeId + ", sock=" + sock + ']'); } } finally {
