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 <[email protected]> Authored: Mon Nov 2 10:44:34 2015 +0300 Committer: sboikov <[email protected]> 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; }
