# Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-1003-debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d9ebd3bd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d9ebd3bd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d9ebd3bd Branch: refs/heads/ignite-1003-debug Commit: d9ebd3bdc50874747a220b7ca3ec94db1efbf751 Parents: e0ff663 ad0a026 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jun 18 16:14:44 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jun 18 16:14:44 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheUtils.java | 9 +++++ .../processors/cache/IgniteCacheProxy.java | 5 +++ .../processors/query/GridQueryProcessor.java | 7 ++++ .../communication/tcp/TcpCommunicationSpi.java | 6 +-- .../ignite/spi/discovery/tcp/ServerImpl.java | 35 ++++++++++++---- .../spi/discovery/tcp/TcpDiscoverySpi.java | 42 ++++++++++++++------ .../tcp/internal/TcpDiscoveryNode.java | 18 +++++++++ .../apache/ignite/internal/GridSelfTest.java | 20 ++++++---- .../DataStreamerMultiThreadedSelfTest.java | 3 ++ 9 files changed, 114 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9ebd3bd/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d9ebd3bd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index a55d803,b743a1a..450e234 --- 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 @@@ -435,30 -435,26 +435,35 @@@ class ServerImpl extends TcpDiscoveryIm return false; } - for (InetSocketAddress addr : spi.getNodeAddresses(node, U.sameMacs(locNode, node))) { - try { - // ID returned by the node should be the same as ID of the parameter for ping to succeed. - IgniteBiTuple<UUID, Boolean> t = pingNode(addr, clientNodeId); + log.info("Start ping node [node=" + node + ']'); - boolean res = node.id().equals(t.get1()) && (clientNodeId == null || t.get2()); + long start = U.currentTimeMillis(); - if (res) - node.lastSuccessfulAddress(addr); + try { + for (InetSocketAddress addr : spi.getNodeAddresses(node, U.sameMacs(locNode, node))) { + try { + // ID returned by the node should be the same as ID of the parameter for ping to succeed. + IgniteBiTuple<UUID, Boolean> t = pingNode(addr, clientNodeId); - return node.id().equals(t.get1()) && (clientNodeId == null || t.get2()); - return res; - } - catch (IgniteCheckedException e) { - if (log.isDebugEnabled()) - log.debug("Failed to ping node [node=" + node + ", err=" + e.getMessage() + ']'); ++ boolean res = node.id().equals(t.get1()) && (clientNodeId == null || t.get2()); ++ ++ if (res) ++ node.lastSuccessfulAddress(addr); + - onException("Failed to ping node [node=" + node + ", err=" + e.getMessage() + ']', e); - // continue; ++ return res; + } + catch (IgniteCheckedException e) { + if (log.isDebugEnabled()) + log.debug("Failed to ping node [node=" + node + ", err=" + e.getMessage() + ']'); + + onException("Failed to ping node [node=" + node + ", err=" + e.getMessage() + ']', e); + // continue; + } } } + finally { + log.info("End ping node [time=" + (U.currentTimeMillis() - start) + ", node=" + node + ']'); + } return false; }
