You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2018/11/29 12:16:29 UTC
[33/50] [abbrv] ignite git commit: IGNITE-10106 Optimize several
Cache 5 tests by scale factor - Fixes #5252.
IGNITE-10106 Optimize several Cache 5 tests by scale factor - Fixes #5252.
Signed-off-by: Pavel Kovalenko <jo...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9d3c7573
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9d3c7573
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9d3c7573
Branch: refs/heads/ignite-10044
Commit: 9d3c757355980fae9b558b0c2e736265adc028a0
Parents: 0b4282b
Author: Alexey Platonov <ap...@gmail.com>
Authored: Tue Nov 27 19:55:06 2018 +0300
Committer: Pavel Kovalenko <jo...@gmail.com>
Committed: Tue Nov 27 19:55:06 2018 +0300
----------------------------------------------------------------------
.../CacheSerializableTransactionsTest.java | 32 +++++++++-----------
.../IgniteCacheStarvationOnRebalanceTest.java | 5 +--
2 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9d3c7573/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index 714ae6a..0afd4ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -71,6 +71,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.apache.ignite.transactions.TransactionConcurrency;
@@ -3529,9 +3530,9 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
IgniteTransactions txs = ignite.transactions();
- final int KEYS = 100;
+ final int KEYS = SF.apply(100);
- for (int i = 0; i < 1000; i++) {
+ for (int i = 0; i < SF.apply(1000); i++) {
Integer key1 = rnd.nextInt(KEYS);
Integer key2;
@@ -3671,14 +3672,14 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
final long stopTime = U.currentTimeMillis() + getTestTimeout() - 30_000;
- for (int i = 0; i < 30; i++) {
+ for (int i = 0; i < SF.apply(30); i++) {
final AtomicInteger cntr = new AtomicInteger();
final Integer key = i;
final AtomicInteger threadIdx = new AtomicInteger();
- final int THREADS = 10;
+ final int THREADS = SF.applyLB(10, 2);
final CyclicBarrier barrier = new CyclicBarrier(THREADS);
@@ -3696,7 +3697,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
barrier.await();
- for (int i = 0; i < 1000; i++) {
+ for (int i = 0; i < SF.apply(1000); i++) {
if (i % 100 == 0 && U.currentTimeMillis() > stopTime)
break;
@@ -3911,7 +3912,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
caches.add(client.<Integer, Integer>cache(cacheName));
}
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < SF.apply(100); i++) {
if (U.currentTimeMillis() > stopTime)
break;
@@ -3921,7 +3922,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
final AtomicInteger threadIdx = new AtomicInteger();
- final int THREADS = 10;
+ final int THREADS = SF.applyLB(10, 2);
final CyclicBarrier barrier = new CyclicBarrier(THREADS);
@@ -3943,7 +3944,7 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
barrier.await();
- for (int i = 0; i < 50; i++) {
+ for (int i = 0; i < SF.apply(50); i++) {
while (true) {
try {
ThreadLocalRandom rnd = ThreadLocalRandom.current();
@@ -3963,10 +3964,8 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
tx.commit();
if (rmv) {
- if (val != null) {
- for (int j = 0; j < val; j++)
- cntr.decrementAndGet();
- }
+ if (val != null)
+ cntr.getAndUpdate(x -> x - val);
}
else
cntr.incrementAndGet();
@@ -4669,9 +4668,6 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
final boolean restart,
final boolean nonSer
) throws Exception {
- if (FAST)
- return;
-
assert !updateNodes.isEmpty();
final Ignite srv = ignite(1);
@@ -4680,17 +4676,17 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
srv.createCache(cacheConfiguration(PARTITIONED, FULL_SYNC, 1, false, false)).getName();
try {
- final int KEYS = 100;
+ final int KEYS = SF.apply(20);
final AtomicBoolean finished = new AtomicBoolean();
IgniteInternalFuture<?> fut = restart ? restartFuture(finished, null) : null;
try {
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < SF.applyLB(10, 2); i++) {
log.info("Iteration: " + i);
- final long stopTime = U.currentTimeMillis() + 10_000;
+ final long stopTime = U.currentTimeMillis() + SF.applyLB(10_000, 1_000);
final AtomicInteger idx = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/ignite/blob/9d3c7573/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStarvationOnRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStarvationOnRebalanceTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStarvationOnRebalanceTest.java
index 621d10d..85d463f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStarvationOnRebalanceTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStarvationOnRebalanceTest.java
@@ -29,6 +29,7 @@ import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.GridTestUtils.SF;
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -89,7 +90,7 @@ public class IgniteCacheStarvationOnRebalanceTest extends GridCacheAbstractSelfT
public void testLoadSystemWithPutAndStartRebalancing() throws Exception {
final IgniteCache<Integer, CacheValue> cache = grid(0).cache(DEFAULT_CACHE_NAME);
- final long endTime = System.currentTimeMillis() + TEST_TIMEOUT - 60_000;
+ final long endTime = System.currentTimeMillis() + SF.applyLB((int)TEST_TIMEOUT - 60_000, 5_000);
int iter = 0;
@@ -99,7 +100,7 @@ public class IgniteCacheStarvationOnRebalanceTest extends GridCacheAbstractSelfT
final AtomicBoolean stop = new AtomicBoolean();
IgniteInternalFuture<?> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
- @Override public Void call() throws Exception {
+ @Override public Void call() {
ThreadLocalRandom rnd = ThreadLocalRandom.current();
while (!stop.get() && System.currentTimeMillis() < endTime) {