You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/04/18 10:02:39 UTC
[7/7] ignite git commit: IGNITE-4985 - Optimize grids startup in tests
IGNITE-4985 - Optimize grids startup in tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed5ac026
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed5ac026
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed5ac026
Branch: refs/heads/ignite-4985
Commit: ed5ac026b5effb2add989498373385a79310e29f
Parents: 6acd273
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 18 13:03:05 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 18 13:03:05 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/IgniteCacheCreatePutTest.java | 4 ++--
.../ignite/testframework/junits/GridAbstractTest.java | 9 ++++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed5ac026/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
index 40440e0..8b8db1c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheCreatePutTest.java
@@ -102,7 +102,7 @@ public class IgniteCacheCreatePutTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testStartNodes() throws Exception {
- long stopTime = System.currentTimeMillis() + 2 * 60_000;
+ long stopTime = System.currentTimeMillis() + 60_000;
try {
int iter = 0;
@@ -153,7 +153,7 @@ public class IgniteCacheCreatePutTest extends GridCommonAbstractTest {
ignite0.createCache(cacheConfiguration("atomic-cache", ATOMIC));
ignite0.createCache(cacheConfiguration("tx-cache", TRANSACTIONAL));
- final long stopTime = System.currentTimeMillis() + 60_000;
+ final long stopTime = System.currentTimeMillis() + 30_000;
final AtomicInteger updateThreadIdx = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed5ac026/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 af623da..2ce2315 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
@@ -698,6 +698,13 @@ public abstract class GridAbstractTest extends TestCase {
info("Starting grids: " + cnt);
+ if (G.allGrids().isEmpty()) {
+ // Start first grid in single-threaded mode to avoid 2-seconds pause on concurrent grid start.
+ startGrid(init++);
+
+ cnt--;
+ }
+
final AtomicInteger gridIdx = new AtomicInteger(init);
GridTestUtils.runMultiThreaded(
@@ -712,7 +719,7 @@ public abstract class GridAbstractTest extends TestCase {
"grid-starter-" + getName()
);
- assert gridIdx.get() - init == cnt;
+ assertEquals(cnt, gridIdx.get() - init);
return grid(init);
}