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/11/03 07:27:05 UTC
[2/2] ignite git commit: ignite-1758-1 debug
ignite-1758-1 debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43c15300
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43c15300
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43c15300
Branch: refs/heads/ignite-1758-debug
Commit: 43c1530096f809e27f02ac7fbfd2d7c07a5059fa
Parents: 681bdc9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 3 09:26:54 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 3 09:26:54 2015 +0300
----------------------------------------------------------------------
.../tcp/TcpDiscoveryMultiThreadedTest.java | 25 ++++++++++----------
1 file changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/43c15300/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 26798a4..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
@@ -212,21 +212,22 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
public void _testMultiThreadedClientsServersRestart() throws Throwable {
fail("https://issues.apache.org/jira/browse/IGNITE-1123");
- multiThreadedClientsServersRestart(true);
+ multiThreadedClientsServersRestart(GRID_CNT, CLIENT_GRID_CNT);
}
/**
* @throws Exception If any error occurs.
*/
public void testMultiThreadedServersRestart() throws Throwable {
- multiThreadedClientsServersRestart(false);
+ multiThreadedClientsServersRestart(GRID_CNT * 2, 0);
}
/**
- * @param clients If {@code true} restarts client nodes.
+ * @param srvs Number of servers.
+ * @param clients Number of clients.
* @throws Exception If any error occurs.
*/
- private void multiThreadedClientsServersRestart(boolean clients) throws Throwable {
+ private void multiThreadedClientsServersRestart(int srvs, int clients) throws Throwable {
final AtomicBoolean done = new AtomicBoolean();
try {
@@ -234,20 +235,20 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
info("Test timeout: " + (getTestTimeout() / (60 * 1000)) + " min.");
- startGridsMultiThreaded(GRID_CNT);
+ startGridsMultiThreaded(srvs);
IgniteInternalFuture<?> clientFut = null;
final AtomicReference<Throwable> error = new AtomicReference<>();
- if (clients) {
+ if (clients > 0) {
clientFlagGlobal = true;
- startGridsMultiThreaded(GRID_CNT, CLIENT_GRID_CNT);
+ startGridsMultiThreaded(srvs, clients);
final BlockingQueue<Integer> clientStopIdxs = new LinkedBlockingQueue<>();
- for (int i = GRID_CNT; i < GRID_CNT + CLIENT_GRID_CNT; i++)
+ for (int i = srvs; i < srvs + clients; i++)
clientStopIdxs.add(i);
final AtomicInteger clientStartIdx = new AtomicInteger(9000);
@@ -311,16 +312,16 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
return null;
}
},
- CLIENT_GRID_CNT,
+ clients,
"client-restart");
}
final BlockingQueue<Integer> srvStopIdxs = new LinkedBlockingQueue<>();
- for (int i = 0; i < GRID_CNT; i++)
+ for (int i = 0; i < srvs; i++)
srvStopIdxs.add(i);
- final AtomicInteger srvStartIdx = new AtomicInteger(GRID_CNT + CLIENT_GRID_CNT);
+ final AtomicInteger srvStartIdx = new AtomicInteger(srvs + clients);
IgniteInternalFuture<?> srvFut = multithreadedAsync(
new Callable<Object>() {
@@ -358,7 +359,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
return null;
}
},
- GRID_CNT - 1,
+ srvs - 1,
"server-restart");
final long timeToExec = getTestTimeout() - 60_000;