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 12:04:42 UTC
[ignite] branch master updated: IGNITE-12477 Speedup Queries 1 test
suite - Fixes #7177.
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 349846c IGNITE-12477 Speedup Queries 1 test suite - Fixes #7177.
349846c is described below
commit 349846c8cfab40fe0c746a789ccc018f3b83c906
Author: pavlukhin <vo...@gmail.com>
AuthorDate: Tue Dec 24 15:04:27 2019 +0300
IGNITE-12477 Speedup Queries 1 test suite - Fixes #7177.
Signed-off-by: ipavlukhin <vo...@gmail.com>
---
.../IgniteClientReconnectFailoverAbstractTest.java | 2 +-
.../cache/query/CacheScanQueryFailoverTest.java | 17 ++----------
.../processors/cache/BigEntryQueryTest.java | 5 +++-
.../cache/CacheQueryEvictDataLostTest.java | 4 ++-
...tributedPartitionQueryNodeRestartsSelfTest.java | 3 +-
.../processors/cache/index/BasicIndexTest.java | 32 +++++++++++++++-------
...actQueryTableLockAndConnectionPoolSelfTest.java | 2 +-
.../processors/query/SqlSchemaSelfTest.java | 2 +-
8 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
index 37292ff..70703a1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectFailoverAbstractTest.java
@@ -51,7 +51,7 @@ public abstract class IgniteClientReconnectFailoverAbstractTest extends IgniteCl
private volatile CyclicBarrier barrier;
/** */
- protected static final long TEST_TIME = 90_000;
+ protected static final long TEST_TIME = GridTestUtils.SF.applyLB(90_000, 30_000);
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java
index 488ce18..bd63e85 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/CacheScanQueryFailoverTest.java
@@ -59,19 +59,6 @@ public class CacheScanQueryFailoverTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected boolean isMultiJvm() {
- return true;
- }
-
- /** {@inheritDoc} */
- @Override protected boolean isRemoteJvm(String igniteInstanceName) {
- if(igniteInstanceName.equals("client") || igniteInstanceName.equals("server"))
- return false;
- else
- return super.isRemoteJvm(igniteInstanceName);
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String name) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(name);
@@ -88,7 +75,7 @@ public class CacheScanQueryFailoverTest extends GridCommonAbstractTest {
*/
@Test
public void testScanQueryWithFailedClosures() throws Exception {
- Ignite srv = startGrids(4);
+ Ignite srv = startGridsMultiThreaded(4);
Ignite client = startGrid("client");
CacheConfiguration cfg = new CacheConfiguration(DEFAULT_CACHE_NAME).setCacheMode(PARTITIONED);
@@ -107,7 +94,7 @@ public class CacheScanQueryFailoverTest extends GridCommonAbstractTest {
*/
@Test
public void testScanQueryOverLocalCacheWithFailedClosures() throws Exception {
- Ignite srv = startGrids(4);
+ Ignite srv = startGridsMultiThreaded(4);
queryCachesWithFailedPredicates(srv, new CacheConfiguration(LOCAL_CACHE_NAME).setCacheMode(LOCAL));
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BigEntryQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BigEntryQueryTest.java
index 8e0c71d..d72ac48 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BigEntryQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/BigEntryQueryTest.java
@@ -38,6 +38,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.EventType;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.junit.Test;
@@ -68,9 +69,11 @@ public class BigEntryQueryTest extends GridCommonAbstractTest {
int ctr = 0;
+ int testDuration = GridTestUtils.SF.applyLB(30_000, 10_000);
+
long time0 = System.currentTimeMillis();
- while ((System.currentTimeMillis() - time0) < 30_000) {
+ while ((System.currentTimeMillis() - time0) < testDuration) {
String cacheName = CACHE + ctr++;
IgniteCache<Long, Value> cache = client.getOrCreateCache(new CacheConfiguration<Long, Value>(cacheName)
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java
index 4618737..d8cdc34 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryEvictDataLostTest.java
@@ -74,7 +74,9 @@ public class CacheQueryEvictDataLostTest extends GridCommonAbstractTest {
*/
@Test
public void testQueryDataLost() throws Exception {
- final long stopTime = U.currentTimeMillis() + 30_000;
+ int testDuration = GridTestUtils.SF.applyLB(30_000, 10_000);
+
+ final long stopTime = U.currentTimeMillis() + testDuration;
GridTestUtils.runMultiThreaded(new IgniteInClosure<Integer>() {
void putGet(IgniteCache<Object, Object> cache) {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java
index 7c584ac..f76114f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java
@@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicIntegerArray;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.junit.Test;
@@ -98,7 +99,7 @@ public class IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest extends
}, RESTART_THREADS_CNT);
// Test duration.
- U.sleep(60_000);
+ U.sleep(GridTestUtils.SF.applyLB(60_000, 20_000));
stop.set(true);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java
index dd07d46..46210db 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BasicIndexTest.java
@@ -41,6 +41,7 @@ import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.processors.query.QueryUtils;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.ListeningTestLogger;
import org.apache.ignite.testframework.LogListener;
import org.apache.ignite.testframework.junits.WithSystemProperty;
@@ -181,7 +182,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
/** */
@Test
public void testNoIndexesNoPersistence() throws Exception {
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -199,6 +200,17 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
}
/** */
+ private int[] inlineSizeVariations() {
+ int[] baseVariations = {0, 10, 20, 50, 100};
+
+ // Determine if scaling is needed, we are not accurate here
+ if (GridTestUtils.SF.apply(baseVariations.length) < baseVariations.length)
+ return new int[] {0, 20, 100};
+
+ return baseVariations;
+ }
+
+ /** */
@Test
public void testAllIndexesNoPersistence() throws Exception {
indexes = Arrays.asList(
@@ -210,7 +222,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
new QueryIndex("valPojo")
);
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -230,7 +242,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
/** */
@Test
public void testDynamicIndexesNoPersistence() throws Exception {
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -782,7 +794,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
public void testNoIndexesWithPersistence() throws Exception {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -821,7 +833,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -926,7 +938,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
public void testDynamicIndexesWithPersistence() throws Exception {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -965,7 +977,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
public void testDynamicIndexesDropWithPersistence() throws Exception {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -1010,7 +1022,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
public void testNoIndexesWithPersistenceIndexRebuild() throws Exception {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -1059,7 +1071,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
@@ -1099,7 +1111,7 @@ public class BasicIndexTest extends AbstractIndexingCommonTest {
public void testDynamicIndexesWithPersistenceIndexRebuild() throws Exception {
isPersistenceEnabled = true;
- int[] inlineSizes = {0, 10, 20, 50, 100};
+ int[] inlineSizes = inlineSizeVariations();
for (int i : inlineSizes) {
log().info("Checking inlineSize=" + i);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java
index 485fb11..91dc04a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/AbstractQueryTableLockAndConnectionPoolSelfTest.java
@@ -53,7 +53,7 @@ public abstract class AbstractQueryTableLockAndConnectionPoolSelfTest extends Ab
private static final int PAGE_SIZE_SMALL = 12;
/** Test duration. */
- private static final long TEST_DUR = 10_000L;
+ private static final long TEST_DUR = GridTestUtils.SF.applyLB(10_000, 3_000);
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
index 16bfc2b..8dc167c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/SqlSchemaSelfTest.java
@@ -248,7 +248,7 @@ public class SqlSchemaSelfTest extends AbstractIndexingCommonTest {
GridTestUtils.runMultiThreaded(new Runnable() {
@Override public void run() {
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < GridTestUtils.SF.applyLB(100, 20); i++) {
int idx = maxIdx.incrementAndGet();
String tbl = "Person" + idx;