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 2018/11/13 08:17:51 UTC
ignite git commit: IGNITE-10141 Cache 3 suite tests optimization -
Fixes #5254.
Repository: ignite
Updated Branches:
refs/heads/master a719aa9ca -> ecf750fcd
IGNITE-10141 Cache 3 suite tests optimization - Fixes #5254.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ecf750fc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ecf750fc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ecf750fc
Branch: refs/heads/master
Commit: ecf750fcd07e051c6a5859f933cd0e6ace518242
Parents: a719aa9
Author: Alexey Platonov <ap...@gmail.com>
Authored: Tue Nov 13 10:46:52 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Nov 13 10:46:52 2018 +0300
----------------------------------------------------------------------
.../cache/GridAbstractCacheInterceptorRebalanceTest.java | 7 ++++---
.../cache/GridCacheValueConsistencyAbstractSelfTest.java | 5 +++--
.../GridCacheValueConsistencyTransactionalSelfTest.java | 5 +++--
.../cache/GridCacheVersionTopologyChangeTest.java | 3 ++-
.../internal/processors/cache/IgniteCacheGroupsTest.java | 10 ++++++----
5 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecf750fc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
index 611f42b..80b6530 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridAbstractCacheInterceptorRebalanceTest.java
@@ -37,6 +37,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
@@ -57,10 +58,10 @@ public abstract class GridAbstractCacheInterceptorRebalanceTest extends GridComm
private static final String CACHE_NAME = "test_cache";
/** */
- private static final int CNT = 10_000;
+ private static final int CNT = SF.applyLB(10_000, 500);
/** */
- private static final int TEST_ITERATIONS = 5;
+ private static final int TEST_ITERATIONS = SF.applyLB(5, 2);
/** */
private static final int NODES = 5;
@@ -195,7 +196,7 @@ public abstract class GridAbstractCacheInterceptorRebalanceTest extends GridComm
* @throws Exception If fail.
*/
private void testRebalance(final Operation operation) throws Exception {
- long stopTime = System.currentTimeMillis() + 2 * 60_000;
+ long stopTime = System.currentTimeMillis() + SF.applyLB(2 * 60_000, 5_000);
for (int iter = 0; iter < TEST_ITERATIONS && System.currentTimeMillis() < stopTime; iter++) {
log.info("Iteration: " + iter);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecf750fc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
index 19f98ff..aba3250 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyAbstractSelfTest.java
@@ -26,6 +26,7 @@ import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -276,7 +277,7 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
if (nearEnabled())
fail("https://issues.apache.org/jira/browse/IGNITE-627");
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < SF.applyLB(10, 2); i++) {
log.info("Iteration: " + i);
putRemoveConsistencyMultithreaded();
@@ -408,4 +409,4 @@ public abstract class GridCacheValueConsistencyAbstractSelfTest extends GridCach
", backup=" + backup + ']');
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecf750fc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalSelfTest.java
index b8f583b..9cf468f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueConsistencyTransactionalSelfTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
@@ -32,6 +33,6 @@ public class GridCacheValueConsistencyTransactionalSelfTest extends GridCacheVal
/** {@inheritDoc} */
@Override protected int iterationCount() {
- return 50_000;
+ return SF.apply(50_000);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecf750fc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
index 5c9ecd7..9de2338 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVersionTopologyChangeTest.java
@@ -35,6 +35,7 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
@@ -142,7 +143,7 @@ public class GridCacheVersionTopologyChangeTest extends GridCommonAbstractTest {
int nodeIdx = 1;
- for (int n = 0; n < 10; n++) {
+ for (int n = 0; n < SF.applyLB(10, 2); n++) {
startGrid(nodeIdx++);
for (int i = 0; i < caches.size(); i++)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ecf750fc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
index 2104c5d..3d16dd2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGroupsTest.java
@@ -98,6 +98,7 @@ import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.transactions.Transaction;
import org.jetbrains.annotations.Nullable;
@@ -1289,7 +1290,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
public void testStartManyCaches() throws Exception {
- final int CACHES = 5_000;
+ final int CACHES = SF.apply(5_000);
final int NODES = 4;
@@ -3722,7 +3723,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
client = false;
- final int CACHES = 10;
+ final int CACHES = SF.applyLB(10, 2);
final AtomicReferenceArray<IgniteCache> caches = new AtomicReferenceArray<>(CACHES);
@@ -3737,7 +3738,8 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
final AtomicInteger cacheCntr = new AtomicInteger();
try {
- for (int i = 0; i < 10; i++) {
+ final int ITERATIONS_COUNT = SF.applyLB(10, 1);
+ for (int i = 0; i < ITERATIONS_COUNT; i++) {
stop.set(false);
final AtomicReference<Exception> err = new AtomicReference<>();
@@ -3858,7 +3860,7 @@ public class IgniteCacheGroupsTest extends GridCommonAbstractTest {
}
}, 8, "op-thread");
- Thread.sleep(10_000);
+ Thread.sleep(SF.applyLB(10_000, 1_000));
stop.set(true);