You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/20 16:48:39 UTC

incubator-ignite git commit: ignite-1003: adjusted test

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1003 ad8ae4b3c -> da1e46c7f


ignite-1003: adjusted test


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

Branch: refs/heads/ignite-1003
Commit: da1e46c7f6229a52ff586051666a9c1bfdce727c
Parents: ad8ae4b
Author: sboikov <sboikov>
Authored: Mon Jul 20 15:47:21 2015 +0100
Committer: sboikov <sboikov>
Committed: Mon Jul 20 15:47:21 2015 +0100

----------------------------------------------------------------------
 .../tcp/TcpDiscoveryMultiThreadedTest.java        | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da1e46c7/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 e977bed..0722f38 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
@@ -88,16 +88,16 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
 
             ipFinder.setAddresses(srvAddresses);
 
-            cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(10_000).
-                setSocketTimeout(10_000).setHeartbeatFrequency(10_000));
+            cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(17_000).
+                setSocketTimeout(17_000).setHeartbeatFrequency(10_000).setAckTimeout(17_000));
         }
         else
             cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder).setNetworkTimeout(10_000).
                 setSocketTimeout(10_000).setHeartbeatFrequency(10_000));
 
         TcpCommunicationSpi commSpi = new TcpCommunicationSpi();
-        commSpi.setConnectTimeout(10_000);
-        commSpi.setSocketWriteTimeout(10_000);
+        commSpi.setConnectTimeout(17_000);
+        commSpi.setSocketWriteTimeout(17_000);
 
         cfg.setCommunicationSpi(commSpi);
 
@@ -144,12 +144,16 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
 
         final AtomicBoolean done = new AtomicBoolean();
 
+        startGridsMultiThreaded(8, CLIENT_GRID_CNT);
+
+        final AtomicInteger clientIdx = new AtomicInteger(8);
+
         IgniteInternalFuture<?> fut1 = multithreadedAsync(
             new Callable<Object>() {
                 @Override public Object call() throws Exception {
                     clientFlagPerThread.set(true);
 
-                    int idx = 1;
+                    int idx = clientIdx.getAndIncrement();
 
                     while (!done.get()) {
                         stopGrid(idx);
@@ -159,10 +163,10 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
                     return null;
                 }
             },
-            1
+            CLIENT_GRID_CNT
         );
 
-        Thread.sleep(5 * 60 * 1000);
+        Thread.sleep(10 * 60 * 1000);
 
         done.set(true);