ignite-5514 test is slow, break by timeout, unmute test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f45d477 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f45d477 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f45d477 Branch: refs/heads/ignite-2.1.2-exchange Commit: 6f45d47759992f5ceed2b4f61bbea92ee6195842 Parents: 4133d0d Author: Dmitriy Govorukhin <[email protected]> Authored: Wed Jun 21 17:30:28 2017 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Wed Jun 21 17:30:28 2017 +0300 ---------------------------------------------------------------------- .../IgnitePdsCacheRebalancingAbstractTest.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f45d477/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java index e681954..cbc2623 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java @@ -211,8 +211,6 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb * @throws Exception If fails. */ public void testRebalancingOnRestartAfterCheckpoint() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5514";); - IgniteEx ignite0 = startGrid(0); IgniteEx ignite1 = startGrid(1); @@ -242,8 +240,6 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb ignite2.close(); ignite3.close(); - awaitPartitionMapExchange(); - ignite0.resetLostPartitions(Collections.singletonList(cache1.getName())); assert cache1.lostPartitions().isEmpty(); @@ -266,8 +262,6 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb ignite2.cache(cacheName).rebalance().get(); ignite3.cache(cacheName).rebalance().get(); - awaitPartitionMapExchange(); - IgniteCache<Integer, Integer> cache2 = ignite2.cache(cacheName); IgniteCache<Integer, Integer> cache3 = ignite3.cache(cacheName); @@ -379,7 +373,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb * @throws Exception If failed. */ public void testTopologyChangesWithConstantLoad() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-5514";); + final long timeOut = U.currentTimeMillis() + 10 * 60 * 1000; final int entriesCnt = 10_000; int maxNodesCount = 4; @@ -460,6 +454,9 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb }, 1, "load-runner"); for (int i = 0; i < topChanges; i++) { + if (U.currentTimeMillis() > timeOut) + break; + U.sleep(3_000); boolean add; @@ -469,7 +466,7 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb else if (nodesCnt.get() > maxNodesCount) add = false; else // More chance that node will be added - add = ThreadLocalRandom.current().nextInt(3 ) <= 1; + add = ThreadLocalRandom.current().nextInt(3) <= 1; if (add) startGrid(nodesCnt.incrementAndGet());
