You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ip...@apache.org on 2019/12/24 11:57:23 UTC
[ignite] branch master updated: IGNITE-12476 Speedup Continuous
Query 1 tests - Fixes #7176.
This is an automated email from the ASF dual-hosted git repository.
ipavlukhin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 8fafd92 IGNITE-12476 Speedup Continuous Query 1 tests - Fixes #7176.
8fafd92 is described below
commit 8fafd92abb54420b078410f45c733720f422dca2
Author: pavlukhin <vo...@gmail.com>
AuthorDate: Tue Dec 24 14:56:05 2019 +0300
IGNITE-12476 Speedup Continuous Query 1 tests - Fixes #7176.
Signed-off-by: ipavlukhin <vo...@gmail.com>
---
.../continuous/CacheContinuousBatchAckTest.java | 9 ++------
...ntinuousQueryConcurrentPartitionUpdateTest.java | 11 +++++-----
.../CacheContinuousQueryCounterAbstractTest.java | 7 ++++---
.../CacheContinuousQueryExecuteInPrimaryTest.java | 4 +---
...ousQueryFailoverAtomicNearEnabledSelfTest.java} | 2 +-
.../testsuites/IgniteCacheQuerySelfTestSuite3.java | 24 ++++++++--------------
.../testsuites/IgniteCacheQuerySelfTestSuite4.java | 2 ++
7 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
index 3a336d7..b0da778 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
@@ -32,7 +32,6 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.managers.communication.GridIoMessage;
import org.apache.ignite.internal.util.typedef.P1;
-import org.apache.ignite.internal.util.typedef.PA;
import org.apache.ignite.lang.IgniteRunnable;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
@@ -269,14 +268,10 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen
qry = cache.query(q);
- for (int i = 0; i < 10000; i++)
+ for (int i = 0; i < GridTestUtils.SF.applyLB(10000, 1000); i++)
cache.put(i, i);
- assert !GridTestUtils.waitForCondition(new PA() {
- @Override public boolean apply() {
- return fail.get();
- }
- }, 1300L);
+ assertFalse(GridTestUtils.waitForCondition(fail::get, 1300L));
}
finally {
if (qry != null)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
index 2757650..24a73cc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryConcurrentPartitionUpdateTest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
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.apache.ignite.transactions.TransactionSerializationException;
@@ -183,15 +184,15 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo
assertEquals(KEYS, keys.size());
- final int THREADS = 10;
- final int UPDATES = 1000;
+ final int THREADS = SF.applyLB(10, 4);
+ final int UPDATES = SF.applyLB(1000, 100);
final List<IgniteCache<Object, Object>> srvCaches = new ArrayList<>();
for (String cacheName : caches)
srvCaches.add(srv.cache(cacheName));
- for (int i = 0; i < 15; i++) {
+ for (int i = 0; i < SF.applyLB(15, 5); i++) {
log.info("Iteration: " + i);
GridTestUtils.runMultiThreaded(new Callable<Void>() {
@@ -382,7 +383,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo
for (String cacheName : caches)
srvCaches.add(srv.cache(cacheName));
- for (int i = 0; i < 5; i++) {
+ for (int i = 0; i < SF.applyLB(5, 2); i++) {
log.info("Iteration: " + i);
final AtomicBoolean stop = new AtomicBoolean();
@@ -485,7 +486,7 @@ public class CacheContinuousQueryConcurrentPartitionUpdateTest extends GridCommo
}
}, 30000);
- assertEquals(THREADS * UPDATES, qry.get1().get());
+ assertEquals(THREADS * UPDATES, evtCnt.get());
qry.get2().close();
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
index f015e49..d73b6ae 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import javax.cache.Cache;
@@ -46,10 +47,10 @@ import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.lang.IgniteBiInClosure;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import java.util.concurrent.ConcurrentHashMap;
import org.junit.Test;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -378,14 +379,14 @@ public abstract class CacheContinuousQueryCounterAbstractTest extends GridCommon
public void testRestartQuery() throws Exception {
IgniteCache<Integer, Integer> cache = grid(0).cache(CACHE_NAME);
- final int keyCnt = 300;
+ final int keyCnt = SF.applyLB(300, 50);
final int updateKey = 1;
for (int i = 0; i < keyCnt; i++)
cache.put(updateKey, i);
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < SF.applyLB(10, 4); i++) {
if (i % 2 == 0) {
final AtomicInteger cntr = new AtomicInteger(0);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
index bbcd62f..5e6d623 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
@@ -59,9 +59,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
/**
* Continuous queries execute in primary node tests.
*/
-public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstractTest
- implements Serializable {
-
+public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstractTest implements Serializable {
/** Latch timeout. */
protected static final long LATCH_TIMEOUT = 5000;
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfTest.java
similarity index 95%
rename from modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfTest.java
index 4dd7c05..361ec1c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAtomicNearEnabledSelfTest.java
@@ -25,7 +25,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
*
*/
-public class CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest
+public class CacheContinuousQueryFailoverAtomicNearEnabledSelfTest
extends CacheContinuousQueryFailoverAtomicSelfTest {
/** {@inheritDoc} */
@Override protected CacheMode cacheMode() {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
index e4f40a3..26edb91 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite3.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinu
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryCounterReplicatedTxTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryExecuteInPrimaryTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFactoryAsyncFilterRandomOperationTest;
-import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerClientSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousWithTransformerReplicatedSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.ClientReconnectContinuousQueryTest;
@@ -52,36 +51,29 @@ import org.junit.runners.Suite;
GridCacheContinuousQueryNodesFilteringTest.class,
GridCacheContinuousQueryPartitionTxOneNodeTest.class,
CacheContinuousWithTransformerReplicatedSelfTest.class,
- CacheContinuousQueryExecuteInPrimaryTest.class,
CacheContinuousWithTransformerClientSelfTest.class,
- ClientReconnectContinuousQueryTest.class,
+ CacheContinuousQueryExecuteInPrimaryTest.class,
IgniteCacheContinuousQueryNoUnsubscribeTest.class,
+
+ ClientReconnectContinuousQueryTest.class,
+ IgniteCacheContinuousQueryReconnectTest.class,
IgniteCacheContinuousQueryClientTxReconnectTest.class,
IgniteCacheContinuousQueryClientReconnectTest.class,
+
GridCacheContinuousQueryAtomicSelfTest.class,
GridCacheContinuousQueryAtomicNearEnabledSelfTest.class,
- GridCacheContinuousQueryPartitionTxOneNodeTest.class,
- IgniteCacheContinuousQueryClientReconnectTest.class,
- IgniteCacheContinuousQueryClientTxReconnectTest.class,
+ GridCacheContinuousQueryPartitionedSelfTest.class,
GridCacheContinuousQueryReplicatedSelfTest.class,
+
CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class,
- GridCacheContinuousQueryPartitionedSelfTest.class,
CacheContinuousBatchForceServerModeAckTest.class,
- CacheContinuousQueryExecuteInPrimaryTest.class,
- GridCacheContinuousQueryNodesFilteringTest.class,
- IgniteCacheContinuousQueryNoUnsubscribeTest.class,
- ClientReconnectContinuousQueryTest.class,
ContinuousQueryReassignmentTest.class,
CacheContinuousQueryConcurrentPartitionUpdateTest.class,
- CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.class,
CacheContinuousQueryCounterPartitionedAtomicTest.class,
CacheContinuousQueryCounterPartitionedTxTest.class,
CacheContinuousQueryCounterReplicatedAtomicTest.class,
- CacheContinuousQueryCounterReplicatedTxTest.class,
- CacheContinuousQueryFailoverAtomicNearEnabledSelfSelfTest.class,
-
- IgniteCacheContinuousQueryReconnectTest.class
+ CacheContinuousQueryCounterReplicatedTxTest.class
})
public class IgniteCacheQuerySelfTestSuite3 {
}
diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
index 7056ba1..4fa00ed 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite4.java
@@ -21,6 +21,7 @@ import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinu
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverMvccTxSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxReplicatedSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverTxSelfTest;
+import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicNearEnabledSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicReplicatedSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverAtomicSelfTest;
import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFailoverMvccTxReplicatedSelfTest;
@@ -37,6 +38,7 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses({
// Continuous queries failover tests.
CacheContinuousQueryFailoverAtomicSelfTest.class,
+ CacheContinuousQueryFailoverAtomicNearEnabledSelfTest.class,
CacheContinuousQueryFailoverAtomicReplicatedSelfTest.class,
CacheContinuousQueryFailoverTxSelfTest.class,
CacheContinuousQueryFailoverTxReplicatedSelfTest.class,