ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 25609b33a -> 8b5529818


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b552981
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b552981
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b552981

Branch: refs/heads/ignite-1758
Commit: 8b5529818d4f69d79fbcc6b0aecd3db324e403a2
Parents: 25609b3
Author: sboikov 
Authored: Tue Nov 10 11:43:46 2015 +0300
Committer: sboikov 
Committed: Tue Nov 10 11:43:46 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java|  24 ++-
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 147 ++-
 2 files changed, 165 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/8b552981/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 0a36e1c..9ab80f4 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
@@ -2272,6 +2272,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 checkHeartbeatsReceiving();
 
 checkPendingCustomMessages();
+
+checkFailedNodesList();
 }
 
 /**
@@ -4184,7 +4186,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 onException("Failed to respond to 
status check message (connection refused) " +
 "[recipient=" + 
msg.creatorNodeId() + ", status=" + msg.status() + ']', e);
 }
-else {
+else if (!spi.isNodeStopping0()){
 if (pingNode(msg.creatorNode()))
 // Node exists and accepts 
incoming connections.
 U.error(log, "Failed to respond to 
status check message [recipient=" +
@@ -4573,6 +4575,26 @@ class ServerImpl extends TcpDiscoveryImpl {
 }
 }
 
+private void checkFailedNodesList() {
+List msgs = null;
+
+synchronized (mux) {
+for (TcpDiscoveryNode node : failedNodes) {
+if (ring.node(node.id()) != null) {
+if (msgs == null)
+msgs = new ArrayList<>(failedNodes.size());
+
+msgs.add(new 
TcpDiscoveryNodeFailedMessage(getLocalNodeId(), node.id(), 
node.internalOrder()));
+}
+}
+}
+
+if (msgs != null) {
+for (TcpDiscoveryNodeFailedMessage msg : msgs)
+addMessage(msg);
+}
+}
+
 /**
  * Checks and flushes custom event messages if no nodes are attempting 
to join the grid.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b552981/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 13f40d4..f401448 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -28,6 +28,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
@@ -39,6 +40,8 @@ import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteIllegalStateException;
+import org.apache.ignite.Ignition;
 import org.apache.ignite.configuration.CacheConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.events.DiscoveryEvent;
@@ -49,6 +52,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.processors.port.GridPortRecord;
 import 

[9/9] ignite git commit: ignite-1758 debug

[sboikov]

ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70ed06ea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70ed06ea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70ed06ea

Branch: refs/heads/ignite-1758-debug
Commit: 70ed06ea1817859f6131f4b1ad3e44e9769fbe3a
Parents: d61de53
Author: sboikov 
Authored: Wed Nov 11 10:12:59 2015 +0300
Committer: sboikov 
Committed: Wed Nov 11 10:12:59 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 +++-
 .../ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java   | 8 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/70ed06ea/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 9ff0545..13a321a 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
@@ -3476,6 +3476,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 spi.onExchange(node.id(), node.id(), data, 
U.gridClassLoader());
 
 msg.addDiscoveryData(locNodeId, 
spi.collectExchangeData(node.id()));
+
+processMessageFailedNodes(msg);
 }
 
 if (log.isDebugEnabled())
@@ -4107,7 +4109,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 onException("Failed to respond to 
status check message (connection refused) " +
 "[recipient=" + 
msg.creatorNodeId() + ", status=" + msg.status() + ']', e);
 }
-else if (!spi.isNodeStopping0()){
+else if (!spi.isNodeStopping0()) {
 if (pingNode(msg.creatorNode()))
 // Node exists and accepts 
incoming connections.
 U.error(log, "Failed to respond to 
status check message [recipient=" +

http://git-wip-us.apache.org/repos/asf/ignite/blob/70ed06ea/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
index 409e033..4218c16 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySelfTest.java
@@ -72,7 +72,6 @@ import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedM
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage;
-import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingResponse;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.jetbrains.annotations.Nullable;
@@ -186,6 +185,13 @@ public class TcpDiscoverySelfTest extends 
GridCommonAbstractTest {
 return cfg;
 }
 
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+discoMap = null;
+
+super.afterTest();
+}
+
 /**
  * @throws Exception If any error occurs.
  */

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 f96781d8b -> 7661e3ee1


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7661e3ee
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7661e3ee
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7661e3ee

Branch: refs/heads/ignite-1758
Commit: 7661e3ee1d6651cef8399cb05fedae0663b7d327
Parents: f96781d
Author: sboikov 
Authored: Mon Nov 9 16:53:39 2015 +0300
Committer: sboikov 
Committed: Mon Nov 9 16:53:39 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java|  67 +
 .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 142 +--
 2 files changed, 173 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7661e3ee/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 5db1e34..af385e4 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
@@ -1087,9 +1087,20 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 openSock = true;
 
+TcpDiscoveryHandshakeRequest req = new 
TcpDiscoveryHandshakeRequest(locNodeId);
+
+if (msg instanceof TcpDiscoveryJoinRequestMessage) {
+synchronized (failedNodes) {
+for (TcpDiscoveryNode node : failedNodes) {
+debugLog(null, "Add failed node [node=" + node + 
", msg=" + req + ']');
+
+req.addFailedNode(node);
+}
+}
+}
+
 // Handshake.
-spi.writeToSocket(sock, new 
TcpDiscoveryHandshakeRequest(locNodeId), timeoutHelper.nextTimeoutChunk(
-spi.getSocketTimeout()));
+spi.writeToSocket(sock, req, 
timeoutHelper.nextTimeoutChunk(spi.getSocketTimeout()));
 
 TcpDiscoveryHandshakeResponse res = spi.readMessage(sock, 
null, timeoutHelper.nextTimeoutChunk(
 ackTimeout0));
@@ -1760,6 +1771,27 @@ class ServerImpl extends TcpDiscoveryImpl {
 }
 }
 
+private void processMessageFailedNodes(TcpDiscoveryAbstractMessage msg) {
+if (msg.failedNodes() != null) {
+for (UUID nodeId : msg.failedNodes()) {
+TcpDiscoveryNode failedNode = ring.node(nodeId);
+
+if (failedNode != null) {
+boolean add;
+
+synchronized (mux) {
+add = failedNodes.add(failedNode);
+}
+
+if (add)
+debugLog(null, "New failed node [node=" + failedNode + 
", msg=" + msg + ']');
+}
+else
+debugLog(null, "Unknown failed node [nodeId=" + nodeId + 
", msg=" + msg + ']');
+}
+}
+}
+
 /**
  * Discovery messages history used for client reconnect.
  */
@@ -2141,27 +2173,6 @@ class ServerImpl extends TcpDiscoveryImpl {
 log.debug("Connection check frequency is calculated: " + 
connCheckFreq);
 }
 
-private void addMessageFailedNodes(TcpDiscoveryAbstractMessage msg) {
-if (msg.failedNodes() != null) {
-for (UUID nodeId : msg.failedNodes()) {
-TcpDiscoveryNode failedNode = ring.node(nodeId);
-
-if (failedNode != null) {
-boolean add;
-
-synchronized (mux) {
-add = failedNodes.add(failedNode);
-}
-
-if (add)
-debugLog(null, "New failed node [node=" + 
failedNode + ", msg=" + msg + ']');
-}
-else
-debugLog(null, "Unknown failed node [nodeId=" + nodeId 
+ ", msg=" + msg + ']');
-}
-}
-}
-
 /**
  * @param msg Message to process.
  */
@@ -2175,7 +2186,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 spi.stats.onMessageProcessingStarted(msg);
 
-addMessageFailedNodes(msg);
+processMessageFailedNodes(msg);
 
 if (msg instanceof TcpDiscoveryJoinRequestMessage)
 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 7661e3ee1 -> c7cc1aed5


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7cc1aed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7cc1aed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7cc1aed

Branch: refs/heads/ignite-1758
Commit: c7cc1aed50b32c2b59f2ea6ef7aee127f7862fca
Parents: 7661e3e
Author: sboikov 
Authored: Mon Nov 9 17:17:49 2015 +0300
Committer: sboikov 
Committed: Mon Nov 9 17:17:49 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c7cc1aed/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 af385e4..0a36e1c 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
@@ -1786,8 +1786,6 @@ class ServerImpl extends TcpDiscoveryImpl {
 if (add)
 debugLog(null, "New failed node [node=" + failedNode + 
", msg=" + msg + ']');
 }
-else
-debugLog(null, "Unknown failed node [nodeId=" + nodeId + 
", msg=" + msg + ']');
 }
 }
 }

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 c7cc1aed5 -> a818fe7f6


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a818fe7f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a818fe7f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a818fe7f

Branch: refs/heads/ignite-1758
Commit: a818fe7f68a8c6bfc1a5a152cdc6349934d939fc
Parents: c7cc1ae
Author: sboikov 
Authored: Mon Nov 9 17:25:00 2015 +0300
Committer: sboikov 
Committed: Mon Nov 9 17:25:00 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/a818fe7f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 94d3ab9..68c8ebe 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -70,7 +70,7 @@ abstract class TcpDiscoveryImpl {
 protected boolean debugMode = true;
 
 /** Debug messages history. */
-private int debugMsgHist = 50 * 1024;
+private int debugMsgHist = 80 * 1024;
 
 /** Received messages. */
 @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 a818fe7f6 -> f7e040edb


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7e040ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7e040ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7e040ed

Branch: refs/heads/ignite-1758
Commit: f7e040edb2dc307ac373b37d042e9d378884109a
Parents: a818fe7
Author: sboikov 
Authored: Tue Nov 10 09:31:56 2015 +0300
Committer: sboikov 
Committed: Tue Nov 10 09:31:56 2015 +0300

--
 .../ignite/testframework/junits/GridAbstractTest.java  | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f7e040ed/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index d133a84..6dc88e0 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1119,14 +1119,15 @@ public abstract class GridAbstractTest extends TestCase 
{
 if (gridName != null && gridName.matches(".*\\d")) {
 String idStr = UUID.randomUUID().toString();
 
-char[] chars = idStr.toCharArray();
+String idxStr = String.valueOf(getTestGridIndex(gridName));
+
+while (idxStr.length() < 5)
+idxStr = '0' + idxStr;
 
-chars[0] = gridName.charAt(gridName.length() - 1);
-chars[1] = '0';
+char[] chars = idStr.toCharArray();
 
-chars[chars.length - 3] = '0';
-chars[chars.length - 2] = '0';
-chars[chars.length - 1] = gridName.charAt(gridName.length() - 1);
+for (int i = 0; i < idxStr.length(); i++)
+chars[chars.length - idxStr.length() + i] = idxStr.charAt(i);
 
 cfg.setNodeId(UUID.fromString(new String(chars)));
 }

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 0ef5769d4 -> 121d1e0d8


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/121d1e0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/121d1e0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/121d1e0d

Branch: refs/heads/ignite-1758
Commit: 121d1e0d89e66be293543e709985f130125aeb8f
Parents: 0ef5769
Author: sboikov 
Authored: Mon Nov 9 11:36:09 2015 +0300
Committer: sboikov 
Committed: Mon Nov 9 11:36:09 2015 +0300

--
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 9 ++---
 .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java| 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/121d1e0d/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 9084713..810690f 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
@@ -48,7 +48,6 @@ import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.UUID;
 import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -2151,7 +2150,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 log.debug("Processing message [cls=" + 
msg.getClass().getSimpleName() + ", id=" + msg.id() + ']');
 
 if (debugMode)
-debugLog(msg, "Processing message [cls=" + 
msg.getClass().getSimpleName() + ", id=" + msg.id() + ']');
+debugLog(msg, "Processing message [msg=" + msg + ", id=" + 
msg.id() + ']');
 
 spi.stats.onMessageProcessingStarted(msg);
 
@@ -2554,7 +2553,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 ", res=" + res + ']');
 
 if (debugMode)
-debugLog(pendingMsg, "Pending message 
has been sent to next node [msgId=" + msg.id() +
+debugLog(pendingMsg, "Pending message 
has been sent to next node [msg=" + msg +
 ", pendingMsgId=" + 
pendingMsg.id() + ", next=" + next.id() +
 ", res=" + res + ']');
 
@@ -5657,6 +5656,10 @@ class ServerImpl extends TcpDiscoveryImpl {
 log.debug("Message has been added to queue: " + msg);
 }
 
+void addFirst(TcpDiscoveryAbstractMessage msg) {
+queue.addFirst(msg);
+}
+
 /**
  * @param msg Message.
  */

http://git-wip-us.apache.org/repos/asf/ignite/blob/121d1e0d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 72549b3..70678d7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -113,10 +113,12 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 if (client())
 cfg.setClientMode(true);
 
+cfg.setFailureDetectionTimeout(30_000);
+
 cfg.setDiscoverySpi(new TcpDiscoverySpi().
 setIpFinder(ipFinder).
 setJoinTimeout(60_000).
-setNetworkTimeout(10_000));
+setNetworkTimeout(30_000));
 
 int[] evts = {EVT_NODE_FAILED, EVT_NODE_LEFT};
 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 b0329c04d -> f96781d8b


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f96781d8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f96781d8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f96781d8

Branch: refs/heads/ignite-1758
Commit: f96781d8bec83a5425799e78652a7fc17f83d0ba
Parents: b0329c0
Author: sboikov 
Authored: Mon Nov 9 13:37:09 2015 +0300
Committer: sboikov 
Committed: Mon Nov 9 13:37:09 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java| 49 +++-
 .../messages/TcpDiscoveryAbstractMessage.java   | 15 --
 2 files changed, 39 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/f96781d8/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 931a33f..5db1e34 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
@@ -2141,6 +2141,27 @@ class ServerImpl extends TcpDiscoveryImpl {
 log.debug("Connection check frequency is calculated: " + 
connCheckFreq);
 }
 
+private void addMessageFailedNodes(TcpDiscoveryAbstractMessage msg) {
+if (msg.failedNodes() != null) {
+for (UUID nodeId : msg.failedNodes()) {
+TcpDiscoveryNode failedNode = ring.node(nodeId);
+
+if (failedNode != null) {
+boolean add;
+
+synchronized (mux) {
+add = failedNodes.add(failedNode);
+}
+
+if (add)
+debugLog(null, "New failed node [node=" + 
failedNode + ", msg=" + msg + ']');
+}
+else
+debugLog(null, "Unknown failed node [nodeId=" + nodeId 
+ ", msg=" + msg + ']');
+}
+}
+}
+
 /**
  * @param msg Message to process.
  */
@@ -2154,22 +2175,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 spi.stats.onMessageProcessingStarted(msg);
 
-if (msg.failedNodes() != null) {
-for (UUID nodeId : msg.failedNodes()) {
-TcpDiscoveryNode failedNode = ring.node(nodeId);
-
-if (failedNode != null) {
-boolean add;
-
-synchronized (mux) {
-add = failedNodes.add(failedNode);
-}
-
-if (add)
-debugLog(null, "New failed node [node=" + 
failedNode + ", msg=" + msg + ']');
-}
-}
-}
+addMessageFailedNodes(msg);
 
 if (msg instanceof TcpDiscoveryJoinRequestMessage)
 
processJoinRequestMessage((TcpDiscoveryJoinRequestMessage)msg);
@@ -2600,12 +2606,11 @@ class ServerImpl extends TcpDiscoveryImpl {
 timeoutHelper = new 
IgniteSpiOperationTimeoutHelper(spi);
 
 if (!failedNodes.isEmpty()) {
-List failedNodeIds = new 
ArrayList<>(failedNodes.size());
-
-for (TcpDiscoveryNode node : failedNodes)
-failedNodeIds.add(node.id());
+for (TcpDiscoveryNode node : failedNodes) {
+debugLog(null, "Add failed node 
[node=" + node + ", msg=" + msg + ']');
 
-msg.failedNodes(failedNodeIds);
+msg.addFailedNode(node);
+}
 }
 
 writeToSocket(sock, msg, 
timeoutHelper.nextTimeoutChunk(spi.getSocketTimeout()));
@@ -3583,6 +3588,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 for (Map.Entry> entry : 
dataMap.entrySet())
 spi.onExchange(node.id(), entry.getKey(), 
entry.getValue(), U.gridClassLoader());
 }
+
+addMessageFailedNodes(msg);
 }
 
 if (sendMessageToRemotes(msg))

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 08f9994db -> b0329c04d


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0329c04
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0329c04
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0329c04

Branch: refs/heads/ignite-1758
Commit: b0329c04d877b54b8a8ab3b1ea95288152af45ef
Parents: 08f9994
Author: sboikov 
Authored: Mon Nov 9 13:10:03 2015 +0300
Committer: sboikov 
Committed: Mon Nov 9 13:10:03 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java   | 6 +-
 .../spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java  | 2 +-
 .../discovery/tcp/messages/TcpDiscoveryAbstractMessage.java| 2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/b0329c04/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 971e069..931a33f 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
@@ -2159,7 +2159,11 @@ class ServerImpl extends TcpDiscoveryImpl {
 TcpDiscoveryNode failedNode = ring.node(nodeId);
 
 if (failedNode != null) {
-boolean add = failedNodes.add(failedNode);
+boolean add;
+
+synchronized (mux) {
+add = failedNodes.add(failedNode);
+}
 
 if (add)
 debugLog(null, "New failed node [node=" + 
failedNode + ", msg=" + msg + ']');

http://git-wip-us.apache.org/repos/asf/ignite/blob/b0329c04/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
index 7ca092c..b234f40 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java
@@ -451,7 +451,7 @@ public class TcpDiscoveryNodesRing {
  * topology contains less than two nodes.
  */
 @Nullable public TcpDiscoveryNode nextNode(@Nullable 
Collection excluded) {
-assert excluded == null || excluded.isEmpty() || 
!excluded.contains(locNode);
+assert excluded == null || excluded.isEmpty() || 
!excluded.contains(locNode) : excluded;
 
 rwLock.readLock().lock();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/b0329c04/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
index 6fe9dd1..66f5209 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java
@@ -23,6 +23,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.UUID;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteUuid;
 import org.jetbrains.annotations.Nullable;
@@ -66,6 +67,7 @@ public abstract class TcpDiscoveryAbstractMessage implements 
Serializable {
 private short pendingIdx;
 
 /** */
+@GridToStringInclude
 private Collection failedNodes;
 
 /**

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 1d87e9360 -> 1857ea526


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1857ea52
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1857ea52
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1857ea52

Branch: refs/heads/ignite-1758
Commit: 1857ea526cb200a85a3c09009562b07b3b4f9809
Parents: 1d87e93
Author: sboikov 
Authored: Thu Nov 5 11:09:59 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 11:09:59 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1857ea52/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 49d14d5..b70f8aa 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
@@ -2192,6 +2192,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 synchronized (System.out) {
 System.out.println("Error: " + e + " " + 
Thread.currentThread().getName());
 
+debugLog(msg, "Error: " + e);
+
 for (String debug : debugLog) {
 System.out.println(debug);
 }

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 1857ea526 -> eaa011476


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eaa01147
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eaa01147
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eaa01147

Branch: refs/heads/ignite-1758
Commit: eaa011476adaf1d191cd36259934fcac366d6867
Parents: 1857ea5
Author: sboikov 
Authored: Thu Nov 5 11:42:50 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 11:55:21 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java| 21 +++-
 1 file changed, 20 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/eaa01147/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 b70f8aa..da5debf 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
@@ -3119,6 +3119,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 nodeAddedMsg.client(msg.client());
 
+debugLog(nodeAddedMsg, "Process join, internalOrder=" + 
node.internalOrder() + ", msg=" + nodeAddedMsg);
+
 processNodeAddedMessage(nodeAddedMsg);
 
 if (nodeAddedMsg.verified())
@@ -3310,6 +3312,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 TcpDiscoveryNodeAddFinishedMessage addFinishMsg = new 
TcpDiscoveryNodeAddFinishedMessage(locNodeId,
 node.id());
 
+debugLog(addFinishMsg, "Created finish message: " + 
addFinishMsg);
+
 if (node.isClient()) {
 
addFinishMsg.clientDiscoData(msg.oldNodesDiscoveryData());
 
@@ -3568,8 +3572,11 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 return;
 }
-else
+else {
+debugLog(msg, "Coordinator incremented topVer=" + 
ring.topologyVersion() + " " + msg);
+
 msg.topologyVersion(ring.incrementTopologyVersion());
+}
 
 msg.verify(locNodeId);
 }
@@ -3644,6 +3651,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 node.order(topVer);
 
+debugLog(msg, "Node set topVer=" + topVer + " " + msg);
+
 synchronized (mux) {
 spiState = CONNECTED;
 
@@ -3761,6 +3770,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 topVer = ring.incrementTopologyVersion();
 
 msg.topologyVersion(topVer);
+
+debugLog(msg, "Coordinator incremented topVer=" + 
ring.topologyVersion() + " " + msg);
 }
 else {
 topVer = msg.topologyVersion();
@@ -3769,6 +3780,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 boolean b = ring.topologyVersion(topVer);
 
+debugLog(msg, "Node set topVer=" + topVer + " " + b + " " 
+ msg);
+
 assert b : "Topology version has not been updated: [ring=" 
+ ring + ", msg=" + msg +
 ", lastMsg=" + lastMsg + ", spiState=" + 
spiStateCopy() + ']';
 
@@ -3944,6 +3957,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 topVer = ring.incrementTopologyVersion();
 
 msg.topologyVersion(topVer);
+
+debugLog(msg, "Coordinator incremented topVer=" + 
ring.topologyVersion() + " " + msg);
 }
 else {
 topVer = msg.topologyVersion();
@@ -3952,6 +3967,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
 boolean b = ring.topologyVersion(topVer);
 
+debugLog(msg, "Node set topVer=" + topVer + " " + b + " " 
+ msg);
+
 assert b : "Topology version has not been updated: [ring=" 
+ ring + ", msg=" + msg +
 ", lastMsg=" + lastMsg + ", spiState=" + 
spiStateCopy() + ']';
 
@@ -4234,6 +4251,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 TcpDiscoveryNodeFailedMessage 
nodeFailedMsg = new TcpDiscoveryNodeFailedMessage(
 locNodeId, clientNode.id(), 
clientNode.internalOrder());
 
+debugLog(nodeFailedMsg, "Created 
failed message=" + nodeFailedMsg);

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 63cab5d9d -> d2f948d93


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2f948d9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2f948d9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2f948d9

Branch: refs/heads/ignite-1758
Commit: d2f948d9324d354a40b14325c676e5ac808e30ce
Parents: 63cab5d
Author: sboikov 
Authored: Thu Nov 5 17:22:51 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 17:22:51 2015 +0300

--
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java   |  5 -
 .../spi/discovery/tcp/internal/TcpDiscoveryNode.java  | 10 ++
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f948d9/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 638ccb4..89669b5 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
@@ -2200,7 +2200,10 @@ class ServerImpl extends TcpDiscoveryImpl {
 e.printStackTrace();
 
 synchronized (System.out) {
-System.out.println("Error: " + e + " " + 
Thread.currentThread().getName() + ", msg=" + msg);
+System.out.println("Error [err=" + e +
+", thread=" + Thread.currentThread().getName() +
+", msg=" + msg +
+", ring= " + ring + ']');
 
 debugLog(msg, "Error: " + e);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/d2f948d9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
index 362fa2f..85dff47 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java
@@ -71,18 +71,19 @@ public class TcpDiscoveryNode extends 
GridMetadataAwareAdapter implements Cluste
 private Map attrs;
 
 /** Internal discovery addresses as strings. */
-@GridToStringInclude
+@GridToStringExclude
 private Collection addrs;
 
 /** Internal discovery host names as strings. */
+@GridToStringExclude
 private Collection hostNames;
 
 /** */
-@GridToStringInclude
+@GridToStringExclude
 private Collection sockAddrs;
 
 /** */
-@GridToStringInclude
+@GridToStringExclude
 private int discPort;
 
 /** Node metrics. */
@@ -104,6 +105,7 @@ public class TcpDiscoveryNode extends 
GridMetadataAwareAdapter implements Cluste
 private volatile long lastUpdateTime = U.currentTimeMillis();
 
 /** The most recent time when node exchanged a message with a remote node. 
*/
+@GridToStringExclude
 private volatile long lastExchangeTime = U.currentTimeMillis();
 
 /** Metrics provider (transient). */
@@ -111,13 +113,13 @@ public class TcpDiscoveryNode extends 
GridMetadataAwareAdapter implements Cluste
 private DiscoveryMetricsProvider metricsProvider;
 
 /** Visible flag (transient). */
-@GridToStringExclude
 private boolean visible;
 
 /** Grid local node flag (transient). */
 private boolean loc;
 
 /** Version. */
+@GridToStringExclude
 private IgniteProductVersion ver;
 
 /** Alive check (used by clients). */

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 d2f948d93 -> 7b498a60d


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7b498a60
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7b498a60
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7b498a60

Branch: refs/heads/ignite-1758
Commit: 7b498a60d11bfffbbf64406ac683f5004b5112db
Parents: d2f948d
Author: sboikov 
Authored: Thu Nov 5 17:34:05 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 17:34:05 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7b498a60/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 89669b5..0ac7e59 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
@@ -3489,6 +3489,9 @@ class ServerImpl extends TcpDiscoveryImpl {
 spi.gridStartTime = msg.gridStartTime();
 
 for (TcpDiscoveryNode n : top) {
+assert n.internalOrder() < 
node.internalOrder() :
+"Invalid node [topNode=" + n + ", added=" 
+ node + ']';
+
 // Make all preceding nodes and local node 
visible.
 n.visible(true);
 }

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 c3962c443 -> 94119c29e


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94119c29
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94119c29
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94119c29

Branch: refs/heads/ignite-1758
Commit: 94119c29ed74895c07bcdf450e235a8e6a9f71ae
Parents: c3962c4
Author: sboikov 
Authored: Thu Nov 5 14:45:34 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 14:45:34 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java   | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/94119c29/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 0cc3546..2c1cfac 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
@@ -2200,7 +2200,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 e.printStackTrace();
 
 synchronized (System.out) {
-System.out.println("Error: " + e + " " + 
Thread.currentThread().getName());
+System.out.println("Error: " + e + " " + 
Thread.currentThread().getName() + ", msg=" + msg);
 
 debugLog(msg, "Error: " + e);
 
@@ -3322,7 +3322,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 TcpDiscoveryNodeAddFinishedMessage addFinishMsg = new 
TcpDiscoveryNodeAddFinishedMessage(locNodeId,
 node.id());
 
-debugLog(addFinishMsg, "Created finish message: " + 
addFinishMsg);
+debugLog(addFinishMsg, "Created finish message: " + 
addFinishMsg + ", ring=" + ring + ']');
 
 if (node.isClient()) {
 
addFinishMsg.clientDiscoData(msg.oldNodesDiscoveryData());
@@ -3564,6 +3564,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 log.debug("Discarding node add finished message since node 
is not found " +
 "[msg=" + msg + ']');
 
+debugLog(msg, "Discarding node add finished message " + msg + 
", ring=" + ring + ']');
+
 return;
 }
 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 7b498a60d -> c56bb6328


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c56bb632
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c56bb632
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c56bb632

Branch: refs/heads/ignite-1758
Commit: c56bb6328ac0d7a7f303ab2aacc0fc95468d00e8
Parents: 7b498a6
Author: sboikov 
Authored: Thu Nov 5 17:37:19 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 17:37:19 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/c56bb632/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 0ac7e59..8b3cf7d 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
@@ -1897,7 +1897,7 @@ class ServerImpl extends TcpDiscoveryImpl {
  */
 private class PendingMessages implements 
Iterable {
 /** */
-private static final int MAX = 10 * 1024;
+private static final int MAX = 20 * 1024;
 
 /** Pending messages. */
 private final Queue msgs = new 
ArrayDeque<>(MAX * 2);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c56bb632/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 43c48d3..94d3ab9 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -70,7 +70,7 @@ abstract class TcpDiscoveryImpl {
 protected boolean debugMode = true;
 
 /** Debug messages history. */
-private int debugMsgHist = 20 * 1024;
+private int debugMsgHist = 50 * 1024;
 
 /** Received messages. */
 @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 c56bb6328 -> 67484021b


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67484021
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67484021
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67484021

Branch: refs/heads/ignite-1758
Commit: 67484021b3366cb939f071361cbd26bd99ab6b42
Parents: c56bb63
Author: sboikov 
Authored: Thu Nov 5 17:44:53 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 17:44:53 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java| 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/67484021/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 8b3cf7d..a681a5a 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
@@ -3602,6 +3602,11 @@ class ServerImpl extends TcpDiscoveryImpl {
 msg.topologyVersion(ring.incrementTopologyVersion());
 
 debugLog(msg, "Coordinator incremented topVer=" + 
ring.topologyVersion() + " " + msg);
+
+for (TcpDiscoveryNode ringNode : ring.allNodes()) {
+assert ringNode.internalOrder() >= node.order() || 
ringNode.order() > 0 :
+"Invalid node [node=" + node + ", ring=" + ring + 
']';
+}
 }
 
 msg.verify(locNodeId);

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 67484021b -> 257133382


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/25713338
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/25713338
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/25713338

Branch: refs/heads/ignite-1758
Commit: 2571333821c8ae4ee004a416f8b1b76cc63ba034
Parents: 6748402
Author: sboikov 
Authored: Thu Nov 5 18:06:46 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 18:06:46 2015 +0300

--
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java   | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/25713338/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 a681a5a..1c009e9 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
@@ -1941,13 +1941,13 @@ class ServerImpl extends TcpDiscoveryImpl {
 @Nullable IgniteUuid discardId,
 @Nullable IgniteUuid customDiscardId
 ) {
-this.msgs.clear();
-
+//this.msgs.clear();
+//
 if (msgs != null)
 this.msgs.addAll(msgs);
-
-this.discardId = discardId;
-this.customDiscardId = customDiscardId;
+//
+//this.discardId = discardId;
+//this.customDiscardId = customDiscardId;
 }
 
 /**

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 3c4e192bc -> 9b0cb9ddb


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b0cb9dd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b0cb9dd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b0cb9dd

Branch: refs/heads/ignite-1758
Commit: 9b0cb9ddbcd66f2a3ca47d9326057b1314b4faaf
Parents: 3c4e192
Author: sboikov 
Authored: Thu Nov 5 10:06:35 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 10:06:35 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/9b0cb9dd/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 958a40e..8615fa8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -65,7 +65,7 @@ abstract class TcpDiscoveryImpl {
 protected boolean debugMode = true;
 
 /** Debug messages history. */
-private int debugMsgHist = 10 * 1024;
+private int debugMsgHist = 100 * 1024;
 
 /** Received messages. */
 @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 7f150cc7f -> 1d87e9360


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1d87e936
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1d87e936
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1d87e936

Branch: refs/heads/ignite-1758
Commit: 1d87e93606949708179cd10e30e86842d4b818c9
Parents: 7f150cc
Author: sboikov 
Authored: Thu Nov 5 10:50:56 2015 +0300
Committer: sboikov 
Committed: Thu Nov 5 10:50:56 2015 +0300

--
 .../org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/1d87e936/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
index 2a1ee46..40a4536 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java
@@ -39,6 +39,7 @@ import 
org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
 import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage;
 import 
org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage;
+import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryDiscardMessage;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -67,7 +68,7 @@ abstract class TcpDiscoveryImpl {
 protected boolean debugMode = true;
 
 /** Debug messages history. */
-private int debugMsgHist = 100 * 1024;
+private int debugMsgHist = 20 * 1024;
 
 /** Received messages. */
 @SuppressWarnings("FieldAccessedSynchronizedAndUnsynchronized")
@@ -106,7 +107,7 @@ abstract class TcpDiscoveryImpl {
 protected void debugLog(TcpDiscoveryAbstractMessage discoMsg, String msg) {
 assert debugMode;
 
-if (discoMsg != null && discoMsg instanceof 
TcpDiscoveryCustomEventMessage)
+if ((discoMsg instanceof TcpDiscoveryCustomEventMessage) || (discoMsg 
instanceof TcpDiscoveryDiscardMessage))
 return;
 
 String msg0 = new SimpleDateFormat("[HH:mm:ss,SSS]").format(new 
Date(System.currentTimeMillis())) +

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 072238430 -> 3c4e192bc


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c4e192b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c4e192b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c4e192b

Branch: refs/heads/ignite-1758
Commit: 3c4e192bce8b978b46c6dcfa04d4b01802ce62e4
Parents: 0722384
Author: sboikov 
Authored: Wed Nov 4 16:31:26 2015 +0300
Committer: sboikov 
Committed: Wed Nov 4 16:31:26 2015 +0300

--
 .../ignite/spi/discovery/tcp/ServerImpl.java| 101 +++
 .../spi/discovery/tcp/TcpDiscoveryImpl.java |   6 +-
 2 files changed, 61 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/3c4e192b/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 0fe2881..6f22d5b 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
@@ -278,8 +278,6 @@ class ServerImpl extends TcpDiscoveryImpl {
 throw new IgniteSpiException("Info log level should be enabled 
for TCP discovery to work " +
 "in debug mode.");
 
-debugLog = new ConcurrentLinkedDeque<>();
-
 U.quietAndWarn(log, "TCP discovery SPI is configured in debug 
mode.");
 }
 
@@ -2127,65 +2125,82 @@ class ServerImpl extends TcpDiscoveryImpl {
  * @param msg Message to process.
  */
 @Override protected void processMessage(TcpDiscoveryAbstractMessage 
msg) {
-if (log.isDebugEnabled())
-log.debug("Processing message [cls=" + 
msg.getClass().getSimpleName() + ", id=" + msg.id() + ']');
+try {
+if (log.isDebugEnabled())
+log.debug("Processing message [cls=" + 
msg.getClass().getSimpleName() + ", id=" + msg.id() + ']');
 
-if (debugMode)
-debugLog("Processing message [cls=" + 
msg.getClass().getSimpleName() + ", id=" + msg.id() + ']');
+if (debugMode)
+debugLog("Processing message [cls=" + 
msg.getClass().getSimpleName() + ", id=" + msg.id() + ']');
 
-spi.stats.onMessageProcessingStarted(msg);
+spi.stats.onMessageProcessingStarted(msg);
 
-if (msg instanceof TcpDiscoveryJoinRequestMessage)
-processJoinRequestMessage((TcpDiscoveryJoinRequestMessage)msg);
+if (msg instanceof TcpDiscoveryJoinRequestMessage)
+
processJoinRequestMessage((TcpDiscoveryJoinRequestMessage)msg);
 
-else if (msg instanceof TcpDiscoveryClientReconnectMessage)
-
processClientReconnectMessage((TcpDiscoveryClientReconnectMessage)msg);
+else if (msg instanceof TcpDiscoveryClientReconnectMessage)
+
processClientReconnectMessage((TcpDiscoveryClientReconnectMessage)msg);
 
-else if (msg instanceof TcpDiscoveryNodeAddedMessage)
-processNodeAddedMessage((TcpDiscoveryNodeAddedMessage)msg);
+else if (msg instanceof TcpDiscoveryNodeAddedMessage)
+processNodeAddedMessage((TcpDiscoveryNodeAddedMessage)msg);
 
-else if (msg instanceof TcpDiscoveryNodeAddFinishedMessage)
-
processNodeAddFinishedMessage((TcpDiscoveryNodeAddFinishedMessage)msg);
+else if (msg instanceof TcpDiscoveryNodeAddFinishedMessage)
+
processNodeAddFinishedMessage((TcpDiscoveryNodeAddFinishedMessage)msg);
 
-else if (msg instanceof TcpDiscoveryNodeLeftMessage)
-processNodeLeftMessage((TcpDiscoveryNodeLeftMessage)msg);
+else if (msg instanceof TcpDiscoveryNodeLeftMessage)
+processNodeLeftMessage((TcpDiscoveryNodeLeftMessage)msg);
 
-else if (msg instanceof TcpDiscoveryNodeFailedMessage)
-processNodeFailedMessage((TcpDiscoveryNodeFailedMessage)msg);
+else if (msg instanceof TcpDiscoveryNodeFailedMessage)
+
processNodeFailedMessage((TcpDiscoveryNodeFailedMessage)msg);
 
-else if (msg instanceof TcpDiscoveryClientHeartbeatMessage)
-
processClientHeartbeatMessage((TcpDiscoveryClientHeartbeatMessage)msg);
+else if (msg instanceof TcpDiscoveryClientHeartbeatMessage)
+ 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 af2b46cf6 -> 74793b123


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/74793b12
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/74793b12
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/74793b12

Branch: refs/heads/ignite-1758
Commit: 74793b12392f4ec51467ebe26d6b93522518e793
Parents: af2b46c
Author: sboikov 
Authored: Wed Nov 4 14:49:06 2015 +0300
Committer: sboikov 
Committed: Wed Nov 4 14:49:06 2015 +0300

--
 .../tcp/TcpDiscoveryMultiThreadedTest.java  | 148 +++
 .../ignite/testsuites/IgniteSpiTestSuite.java   |  33 +
 2 files changed, 88 insertions(+), 93 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/74793b12/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 55474dc..a6fd9a1 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -161,7 +161,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void testMultiThreadedClientsRestart() throws Exception {
+public void _testMultiThreadedClientsRestart() throws Exception {
 final AtomicBoolean done = new AtomicBoolean();
 
 try {
@@ -209,9 +209,25 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void testMultiThreadedClientsServersRestart() throws Throwable {
+public void _testMultiThreadedClientsServersRestart() throws Throwable {
 fail("https://issues.apache.org/jira/browse/IGNITE-1123;);
 
+multiThreadedClientsServersRestart(GRID_CNT, CLIENT_GRID_CNT);
+}
+
+/**
+ * @throws Exception If any error occurs.
+ */
+public void testMultiThreadedServersRestart() throws Throwable {
+multiThreadedClientsServersRestart(GRID_CNT * 2, 0);
+}
+
+/**
+ * @param srvs Number of servers.
+ * @param clients Number of clients.
+ * @throws Exception If any error occurs.
+ */
+private void multiThreadedClientsServersRestart(int srvs, int clients) 
throws Throwable {
 final AtomicBoolean done = new AtomicBoolean();
 
 try {
@@ -219,91 +235,95 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 
 info("Test timeout: " + (getTestTimeout() / (60 * 1000)) + " 
min.");
 
-startGridsMultiThreaded(GRID_CNT);
+startGridsMultiThreaded(srvs);
 
-clientFlagGlobal = true;
-
-startGridsMultiThreaded(GRID_CNT, CLIENT_GRID_CNT);
+IgniteInternalFuture clientFut = null;
 
 final AtomicReference error = new AtomicReference<>();
 
-final BlockingQueue clientStopIdxs = new 
LinkedBlockingQueue<>();
+if (clients > 0) {
+clientFlagGlobal = true;
 
-for (int i = GRID_CNT; i < GRID_CNT + CLIENT_GRID_CNT; i++)
-clientStopIdxs.add(i);
+startGridsMultiThreaded(srvs, clients);
 
-final AtomicInteger clientStartIdx = new AtomicInteger(9000);
-
-IgniteInternalFuture fut1 = multithreadedAsync(
-new Callable() {
-@Override public Object call() throws Exception {
-try {
-clientFlagPerThread.set(true);
+final BlockingQueue clientStopIdxs = new 
LinkedBlockingQueue<>();
 
-while (!done.get() && error.get() == null) {
-Integer stopIdx = clientStopIdxs.take();
+for (int i = srvs; i < srvs + clients; i++)
+clientStopIdxs.add(i);
 
-log.info("Stop client: " + stopIdx);
+final AtomicInteger clientStartIdx = new AtomicInteger(9000);
 
-stopGrid(stopIdx);
+clientFut = multithreadedAsync(
+new Callable() {
+@Override public Object call() throws Exception {
+try {
+clientFlagPerThread.set(true);
 

[2/3] ignite git commit: ignite-1758 debug

[sboikov]

ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/773c2c47
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/773c2c47
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/773c2c47

Branch: refs/heads/ignite-1758
Commit: 773c2c4739cee5f74ded7821575c495939276d31
Parents: df68b0d
Author: sboikov 
Authored: Mon Nov 2 15:51:51 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 15:51:51 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 .../spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/773c2c47/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 26c11a7..0fe2881 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
@@ -1778,7 +1778,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 Collection top = new 
ArrayList<>(allNodes.size());
 
 for (TcpDiscoveryNode n0 : allNodes) {
-//assert n0.internalOrder() > 0 : n0;
+assert n0.internalOrder() > 0 : n0;
 
 if (n0.internalOrder() < node.internalOrder())
 top.add(n0);

http://git-wip-us.apache.org/repos/asf/ignite/blob/773c2c47/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index 9f4a3fc..6f8e14e 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -189,7 +189,7 @@ public class TcpDiscoveryNodeAddedMessage extends 
TcpDiscoveryAbstractMessage {
  * @param top Topology at the moment when client joined.
  */
 public void clientTopology(Collection top) {
-//assert top != null && !top.isEmpty() : top;
+assert top != null && !top.isEmpty() : top;
 
 this.clientTop = top;
 }

[1/3] ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 bb628d948 -> dbda67ad3


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df68b0d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df68b0d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df68b0d4

Branch: refs/heads/ignite-1758
Commit: df68b0d403df4ff731e84496531a8dd4127020dc
Parents: bb628d9
Author: sboikov 
Authored: Mon Nov 2 15:44:15 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 15:44:15 2015 +0300

--
 .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/df68b0d4/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 104efeb..405b049 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -265,11 +265,11 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 break;
 }
 catch (Exception e) {
-if (X.hasCause(e, 
ClusterTopologyCheckedException.class))
-log.info("Client failed to start: 
" + e);
-else if (X.hasCause(e, 
IgniteClientDisconnectedCheckedException.class) ||
+if (X.hasCause(e, 
IgniteClientDisconnectedCheckedException.class) ||
 X.hasCause(e, 
IgniteClientDisconnectedException.class))
 log.info("Client disconnected: " + 
e);
+else if (X.hasCause(e, 
ClusterTopologyCheckedException.class))
+log.info("Client failed to start: 
" + e);
 else {
 if (failedNodes.contains(id) && 
X.hasCause(e, IgniteSpiException.class))
 log.info("Client failed: " + 
e);

[3/3] ignite git commit: ignite-1758 debug

[sboikov]

ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dbda67ad
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dbda67ad
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dbda67ad

Branch: refs/heads/ignite-1758
Commit: dbda67ad3310738c5bf3e40dcb249c725f5aa8a0
Parents: 773c2c4
Author: sboikov 
Authored: Mon Nov 2 15:54:01 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 15:54:01 2015 +0300

--
 .../tcp/TcpDiscoveryMultiThreadedTest.java  |  8 +++--
 .../testsuites/IgniteClientNodesTestSuite.java  |  6 
 .../ignite/testsuites/IgniteSpiTestSuite.java   | 34 ++--
 3 files changed, 43 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/dbda67ad/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 405b049..55474dc 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -161,7 +161,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void _testMultiThreadedClientsRestart() throws Exception {
+public void testMultiThreadedClientsRestart() throws Exception {
 final AtomicBoolean done = new AtomicBoolean();
 
 try {
@@ -210,6 +210,8 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
  * @throws Exception If any error occurs.
  */
 public void testMultiThreadedClientsServersRestart() throws Throwable {
+fail("https://issues.apache.org/jira/browse/IGNITE-1123;);
+
 final AtomicBoolean done = new AtomicBoolean();
 
 try {
@@ -376,7 +378,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void _testTopologyVersion() throws Exception {
+public void testTopologyVersion() throws Exception {
 clientFlagGlobal = false;
 
 startGridsMultiThreaded(GRID_CNT);
@@ -400,7 +402,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void _testMultipleStartOnCoordinatorStop() throws Exception{
+public void testMultipleStartOnCoordinatorStop() throws Exception{
 for (int k = 0; k < 3; k++) {
 log.info("Iteration: " + k);
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/dbda67ad/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
index 66aaa09..d54b890 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
@@ -36,6 +36,12 @@ public class IgniteClientNodesTestSuite extends TestSuite {
 
 suite.addTestSuite(IgniteClientReconnectMassiveShutdownTest.class);
 
+suite.addTest(IgniteClientReconnectTestSuite.suite());
+
+suite.addTestSuite(IgniteCacheManyClientsTest.class);
+suite.addTestSuite(IgniteCacheClientNodeConcurrentStart.class);
+suite.addTestSuite(IgniteCacheClientReconnectTest.class);
+
 return suite;
 }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/dbda67ad/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
index 9c45dff..fc4023a 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
@@ -19,7 +19,6 @@ package org.apache.ignite.testsuites;
 
 import junit.framework.TestSuite;
 import org.apache.ignite.internal.managers.GridNoopManagerSelfTest;

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 48cf25f78 -> 363a38ab9


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/363a38ab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/363a38ab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/363a38ab

Branch: refs/heads/ignite-1758
Commit: 363a38ab9f21541530520104cf340fc682a07a6a
Parents: 48cf25f
Author: sboikov 
Authored: Mon Nov 2 11:07:37 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 11:07:37 2015 +0300

--
 .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java   | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/363a38ab/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 5cb7f23..55d48a7 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -209,8 +209,6 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
  * @throws Exception If any error occurs.
  */
 public void testMultiThreadedClientsServersRestart() throws Throwable {
-fail("https://issues.apache.org/jira/browse/IGNITE-1123;);
-
 final AtomicBoolean done = new AtomicBoolean();
 
 try {
@@ -375,7 +373,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void testTopologyVersion() throws Exception {
+public void _testTopologyVersion() throws Exception {
 clientFlagGlobal = false;
 
 startGridsMultiThreaded(GRID_CNT);
@@ -399,7 +397,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void testMultipleStartOnCoordinatorStop() throws Exception{
+public void _testMultipleStartOnCoordinatorStop() throws Exception{
 for (int k = 0; k < 3; k++) {
 log.info("Iteration: " + k);
 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 41f52787b -> 48cf25f78


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48cf25f7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48cf25f7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48cf25f7

Branch: refs/heads/ignite-1758
Commit: 48cf25f786c5ca141e347e7855dbda928292ec39
Parents: 41f5278
Author: sboikov 
Authored: Mon Nov 2 11:03:14 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 11:03:14 2015 +0300

--
 .../discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/48cf25f7/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index 6f0e887..e31f765 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -168,6 +168,8 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 
 IgniteCache cache = ignite.cache(null);
 
+assertNotNull(cache);
+
 IgniteTransactions txs = ignite.transactions();
 
 Random rand = new Random();

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 363a38ab9 -> 12fc32344


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/12fc3234
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/12fc3234
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/12fc3234

Branch: refs/heads/ignite-1758
Commit: 12fc32344faec4f8eca6ca0ed37de28c7f7ab1c7
Parents: 363a38a
Author: sboikov 
Authored: Mon Nov 2 12:10:48 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 12:10:48 2015 +0300

--
 .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 +++-
 .../tcp/messages/TcpDiscoveryClientReconnectMessage.java | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/12fc3234/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 aa12890..c39caba 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
@@ -1778,7 +1778,9 @@ class ServerImpl extends TcpDiscoveryImpl {
 Collection top = new 
ArrayList<>(allNodes.size());
 
 for (TcpDiscoveryNode n0 : allNodes) {
-if (n0.internalOrder() != 0 && n0.internalOrder() < 
node.internalOrder())
+assert n0.internalOrder() > 0;
+
+if (n0.internalOrder() < node.internalOrder())
 top.add(n0);
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/12fc3234/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
index c232e6c..7c0cd5d 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryClientReconnectMessage.java
@@ -26,6 +26,7 @@ import org.apache.ignite.lang.IgniteUuid;
 /**
  * Message telling that client node is reconnecting to topology.
  */
+@TcpDiscoveryEnsureDelivery
 public class TcpDiscoveryClientReconnectMessage extends 
TcpDiscoveryAbstractMessage {
 /** */
 private static final long serialVersionUID = 0L;

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 12fc32344 -> 98de9d49a


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98de9d49
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98de9d49
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98de9d49

Branch: refs/heads/ignite-1758
Commit: 98de9d49aabbc57370e2b5d1846a1460b74a3ea5
Parents: 12fc323
Author: sboikov 
Authored: Mon Nov 2 12:39:56 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 12:39:56 2015 +0300

--
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java   |  2 +-
 .../tcp/IgniteClientReconnectMassiveShutdownTest.java | 10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/98de9d49/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 c39caba..d5de093 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
@@ -1778,7 +1778,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 Collection top = new 
ArrayList<>(allNodes.size());
 
 for (TcpDiscoveryNode n0 : allNodes) {
-assert n0.internalOrder() > 0;
+assert n0.internalOrder() > 0 : n0;
 
 if (n0.internalOrder() < node.internalOrder())
 top.add(n0);

http://git-wip-us.apache.org/repos/asf/ignite/blob/98de9d49/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index e31f765..b31fd49 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -22,6 +22,7 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.cache.CacheException;
@@ -41,6 +42,7 @@ import 
org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
 import org.apache.ignite.transactions.Transaction;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
 import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
 import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -141,6 +143,8 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 
 IgniteCache cache = client.getOrCreateCache(cfg);
 
+assertNotNull(cache);
+
 HashMap put = new HashMap<>();
 
 // Load some data.
@@ -155,6 +159,8 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 for (int i = GRID_CNT; i < GRID_CNT + CLIENT_GRID_CNT; i++)
 clientIdx.add(i);
 
+final CountDownLatch latch = new CountDownLatch(CLIENT_GRID_CNT);
+
 IgniteInternalFuture clientsFut = multithreadedAsync(
 new Callable() {
 @Override public Object call() throws Exception {
@@ -174,6 +180,8 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 
 Random rand = new Random();
 
+latch.countDown();
+
 while (!done.get()) {
 try (Transaction tx = txs.txStart(PESSIMISTIC, 
REPEATABLE_READ)) {
 cache.put(String.valueOf(rand.nextInt(10_000)), 
rand.nextInt(50_000));
@@ -209,6 +217,8 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 },
 CLIENT_GRID_CNT, "client-thread");
 
+assertTrue(latch.await(10, SECONDS));
+
 try {
 // Killing a half of server 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 7d03ec2ce -> df808625e


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df808625
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df808625
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df808625

Branch: refs/heads/ignite-1758
Commit: df808625e5ea258b8f351e9940517179406da3dd
Parents: 7d03ec2
Author: sboikov 
Authored: Mon Nov 2 14:36:16 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 14:36:16 2015 +0300

--
 .../discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/df808625/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index da60d7d..30eb691 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -109,7 +109,7 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 /**
  * @throws Exception If any error occurs.
  */
-public void testMassiveServersShutdown3() throws Exception {
+public void _testMassiveServersShutdown3() throws Exception {
 massiveServersShutdown(StopType.CLOSE);
 }
 

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 df808625e -> 280fdf6fe


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/280fdf6f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/280fdf6f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/280fdf6f

Branch: refs/heads/ignite-1758
Commit: 280fdf6fec04c905810fe37747557db96a8ee080
Parents: df80862
Author: sboikov 
Authored: Mon Nov 2 14:45:32 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 14:45:32 2015 +0300

--
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 .../spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/280fdf6f/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 0fe2881..26c11a7 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
@@ -1778,7 +1778,7 @@ class ServerImpl extends TcpDiscoveryImpl {
 Collection top = new 
ArrayList<>(allNodes.size());
 
 for (TcpDiscoveryNode n0 : allNodes) {
-assert n0.internalOrder() > 0 : n0;
+//assert n0.internalOrder() > 0 : n0;
 
 if (n0.internalOrder() < node.internalOrder())
 top.add(n0);

http://git-wip-us.apache.org/repos/asf/ignite/blob/280fdf6f/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
index 6f8e14e..9f4a3fc 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryNodeAddedMessage.java
@@ -189,7 +189,7 @@ public class TcpDiscoveryNodeAddedMessage extends 
TcpDiscoveryAbstractMessage {
  * @param top Topology at the moment when client joined.
  */
 public void clientTopology(Collection top) {
-assert top != null && !top.isEmpty() : top;
+//assert top != null && !top.isEmpty() : top;
 
 this.clientTop = top;
 }

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 c15eb405f -> 7d03ec2ce


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d03ec2c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d03ec2c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d03ec2c

Branch: refs/heads/ignite-1758
Commit: 7d03ec2ce66fb82320fe7c756f1185f2ba787624
Parents: c15eb40
Author: sboikov 
Authored: Mon Nov 2 14:28:46 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 14:28:46 2015 +0300

--
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 ++
 .../tcp/IgniteClientReconnectMassiveShutdownTest.java  | 2 +-
 .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/7d03ec2c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 77e47a7..cef38e8 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1447,6 +1447,12 @@ public class GridDhtPartitionsExchangeFuture extends 
GridFutureAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/7d03ec2c/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
index 30eb691..da60d7d 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/IgniteClientReconnectMassiveShutdownTest.java
@@ -109,7 +109,7 @@ public class IgniteClientReconnectMassiveShutdownTest 
extends GridCommonAbstract
 /**
  * @throws Exception If any error occurs.
  */
-public void _testMassiveServersShutdown3() throws Exception {
+public void testMassiveServersShutdown3() throws Exception {
 massiveServersShutdown(StopType.CLOSE);
 }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/7d03ec2c/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 55d48a7..9954653 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -160,7 +160,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 /**
  * @throws Exception If any error occurs.
  */
-public void testMultiThreadedClientsRestart() throws Exception {
+public void _testMultiThreadedClientsRestart() throws Exception {
 final AtomicBoolean done = new AtomicBoolean();
 
 try {

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 280fdf6fe -> 0f8fa7c92


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f8fa7c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f8fa7c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f8fa7c9

Branch: refs/heads/ignite-1758
Commit: 0f8fa7c922167dc173a9272f29ed91f84e4991fa
Parents: 280fdf6
Author: sboikov 
Authored: Mon Nov 2 15:19:03 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 15:19:03 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java   | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8fa7c9/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 9954653..b049158 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -37,6 +37,7 @@ import 
org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.IgniteKernal;
 import org.apache.ignite.internal.client.util.GridConcurrentHashSet;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.X;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -264,6 +265,8 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 break;
 }
 catch (Exception e) {
+if (X.hasCause(e, 
ClusterTopologyCheckedException.class))
+log.info("Client failed to start: 
" + e);
 if (X.hasCause(e, 
IgniteClientDisconnectedCheckedException.class) ||
 X.hasCause(e, 
IgniteClientDisconnectedException.class))
 log.info("Client disconnected: " + 
e);

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 0f8fa7c92 -> bb628d948


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bb628d94
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bb628d94
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bb628d94

Branch: refs/heads/ignite-1758
Commit: bb628d948da28a892c801d3c8c5cf42160453ce5
Parents: 0f8fa7c
Author: sboikov 
Authored: Mon Nov 2 15:28:09 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 15:28:09 2015 +0300

--
 .../ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/bb628d94/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index b049158..104efeb 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -267,7 +267,7 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
 catch (Exception e) {
 if (X.hasCause(e, 
ClusterTopologyCheckedException.class))
 log.info("Client failed to start: 
" + e);
-if (X.hasCause(e, 
IgniteClientDisconnectedCheckedException.class) ||
+else if (X.hasCause(e, 
IgniteClientDisconnectedCheckedException.class) ||
 X.hasCause(e, 
IgniteClientDisconnectedException.class))
 log.info("Client disconnected: " + 
e);
 else {

[3/3] ignite git commit: ignite-1758 debug

[sboikov]

ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97334ac7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97334ac7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97334ac7

Branch: refs/heads/ignite-1758
Commit: 97334ac73f7961b8ec65bffcacd6ad809662d8db
Parents: 25bd6a9
Author: sboikov 
Authored: Mon Nov 2 10:32:53 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 10:32:53 2015 +0300

--
 .../tcp/TcpDiscoveryMultiThreadedTest.java  |  2 --
 .../ignite/testsuites/IgniteSpiTestSuite.java   | 34 ++--
 2 files changed, 2 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/97334ac7/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 09b3ef8..5cb7f23 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -161,8 +161,6 @@ public class TcpDiscoveryMultiThreadedTest extends 
GridCommonAbstractTest {
  * @throws Exception If any error occurs.
  */
 public void testMultiThreadedClientsRestart() throws Exception {
-fail("https://issues.apache.org/jira/browse/IGNITE-1123;);
-
 final AtomicBoolean done = new AtomicBoolean();
 
 try {

http://git-wip-us.apache.org/repos/asf/ignite/blob/97334ac7/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
index fc4023a..9c45dff 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
 
 import junit.framework.TestSuite;
 import org.apache.ignite.internal.managers.GridNoopManagerSelfTest;
+import org.apache.ignite.spi.discovery.tcp.TcpDiscoveryMultiThreadedTest;
 
 /**
  * Grid SPI test suite.
@@ -31,38 +32,7 @@ public class IgniteSpiTestSuite extends TestSuite {
 public static TestSuite suite() throws Exception {
 TestSuite suite = new TestSuite("Ignite SPIs Test Suite");
 
-// Failover.
-suite.addTest(IgniteSpiFailoverSelfTestSuite.suite());
-
-// Collision.
-suite.addTest(IgniteSpiCollisionSelfTestSuite.suite());
-
-// Event storage.
-suite.addTest(IgniteSpiEventStorageSelfTestSuite.suite());
-
-// Load Balancing.
-suite.addTest(IgniteSpiLoadBalancingSelfTestSuite.suite());
-
-// Swap space.
-suite.addTest(IgniteSpiSwapSpaceSelfTestSuite.suite());
-
-// Checkpoints.
-suite.addTest(IgniteSpiCheckpointSelfTestSuite.suite());
-
-// Deployment
-suite.addTest(IgniteSpiDeploymentSelfTestSuite.suite());
-
-// Discovery.
-suite.addTest(IgniteSpiDiscoverySelfTestSuite.suite());
-
-// Communication.
-suite.addTest(IgniteSpiCommunicationSelfTestSuite.suite());
-
-// Indexing.
-suite.addTest(IgniteSpiIndexingSelfTestSuite.suite());
-
-// All other tests.
-suite.addTestSuite(GridNoopManagerSelfTest.class);
+suite.addTest(new TestSuite(TcpDiscoveryMultiThreadedTest.class));
 
 return suite;
 }

ignite git commit: ignite-1758 debug

[sboikov]

Repository: ignite
Updated Branches:
  refs/heads/ignite-1758 97334ac73 -> 41f52787b


ignite-1758 debug


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41f52787
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41f52787
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41f52787

Branch: refs/heads/ignite-1758
Commit: 41f52787b9ce69ae08cf89f44cd5581dfbc2e083
Parents: 97334ac
Author: sboikov 
Authored: Mon Nov 2 10:44:34 2015 +0300
Committer: sboikov 
Committed: Mon Nov 2 10:44:34 2015 +0300

--
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 ++--
 .../ignite/testsuites/IgniteClientNodesTestSuite.java   |  7 ++-
 2 files changed, 8 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/41f52787/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 ee9f818..aa12890 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
@@ -1454,18 +1454,18 @@ class ServerImpl extends TcpDiscoveryImpl {
 tmp = U.arrayList(readers);
 }
 
-for (ClientMessageWorker msgWorker : clientMsgWorkers.values()) {
-U.interrupt(msgWorker);
-
-U.join(msgWorker, log);
-}
-
 U.interrupt(tmp);
 U.joinThreads(tmp, log);
 
 U.interrupt(msgWorker);
 U.join(msgWorker, log);
 
+for (ClientMessageWorker msgWorker : clientMsgWorkers.values()) {
+U.interrupt(msgWorker);
+
+U.join(msgWorker, log);
+}
+
 U.interrupt(statsPrinter);
 U.join(statsPrinter, log);
 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/41f52787/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
--
diff --git 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
index c9405fa..66aaa09 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteClientNodesTestSuite.java
@@ -21,6 +21,7 @@ import junit.framework.TestSuite;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientNodeConcurrentStart;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheClientReconnectTest;
 import 
org.apache.ignite.internal.processors.cache.distributed.IgniteCacheManyClientsTest;
+import 
org.apache.ignite.spi.discovery.tcp.IgniteClientReconnectMassiveShutdownTest;
 
 /**
  *
@@ -33,11 +34,7 @@ public class IgniteClientNodesTestSuite extends TestSuite {
 public static TestSuite suite() throws Exception {
 TestSuite suite = new TestSuite("Ignite Client Nodes Reconnect Test 
Suite");
 
-suite.addTest(IgniteClientReconnectTestSuite.suite());
-
-suite.addTestSuite(IgniteCacheManyClientsTest.class);
-suite.addTestSuite(IgniteCacheClientNodeConcurrentStart.class);
-suite.addTestSuite(IgniteCacheClientReconnectTest.class);
+suite.addTestSuite(IgniteClientReconnectMassiveShutdownTest.class);
 
 return suite;
 }