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 2017/08/02 17:23:02 UTC
ignite git commit: IGNITE-5759 - Mute hanging test - Fixes #2373.
Repository: ignite
Updated Branches:
refs/heads/master 88818ecc5 -> d2cb2f79b
IGNITE-5759 - Mute hanging test - Fixes #2373.
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/d2cb2f79
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2cb2f79
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2cb2f79
Branch: refs/heads/master
Commit: d2cb2f79b323d1b918e495c8490b1de597004774
Parents: 88818ec
Author: dspavlov <dp...@gridgain.com>
Authored: Wed Aug 2 20:21:53 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Wed Aug 2 20:21:53 2017 +0300
----------------------------------------------------------------------
...titionEvictionDuringReadThroughSelfTest.java | 58 ++++++++++++++------
.../testsuites/IgniteCacheTestSuite5.java | 1 -
.../testsuites/IgniteCacheTestSuite6.java | 3 +-
3 files changed, 43 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d2cb2f79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
index ee0e536..5a9e86a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionEvictionDuringReadThroughSelfTest.java
@@ -18,8 +18,8 @@
package org.apache.ignite.internal.processors.cache.distributed;
import java.util.LinkedHashSet;
+import java.util.Set;
import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.cache.Cache;
@@ -36,6 +36,8 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -43,6 +45,12 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
*
*/
public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCommonAbstractTest {
+ /** Failing key. */
+ private static final int FAILING_KEY = 3;
+
+ /** Data read grid index. */
+ private static final int DATA_READ_GRID_IDX = 0;
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -76,28 +84,30 @@ public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCom
* @throws Exception if failed.
*/
public void testPartitionRent() throws Exception {
- startGrid(0);
+ startGrid(DATA_READ_GRID_IDX);
final AtomicBoolean done = new AtomicBoolean();
- IgniteInternalFuture<Long> fut = GridTestUtils.runMultiThreadedAsync(new Callable<Integer>() {
+ IgniteInternalFuture<Long> gridAndCacheAccessFut = GridTestUtils.runMultiThreadedAsync(new Callable<Integer>() {
@Override
public Integer call() throws Exception {
- LinkedHashSet<Integer> set = new LinkedHashSet<>();
+ final Set<Integer> keysSet = new LinkedHashSet<>();
- set.add(1);
- set.add(2);
- set.add(3);
- set.add(4);
- set.add(5);
+ keysSet.add(1);
+ keysSet.add(2);
+ keysSet.add(FAILING_KEY);
+ keysSet.add(4);
+ keysSet.add(5);
while (!done.get()) {
try {
- grid(0).<Integer, Integer>cache("config").getAll(set);
+ grid(DATA_READ_GRID_IDX).<Integer, Integer>cache("config").getAll(keysSet);
}
catch (Throwable ignore) {
// No-op.
}
+ if(Thread.currentThread().isInterrupted())
+ throw new IgniteInterruptedCheckedException("Execution of ["+Thread.currentThread().getName()+"] Interrupted. Test is probably timed out");
}
return null;
@@ -116,11 +126,18 @@ public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCom
}
});
- startFut.get();
+ try {
+ startFut.get();
+ }
+ catch (Exception e) {
+ gridAndCacheAccessFut.cancel();
+ U.error(log, e);
+ throw e;
+ }
done.set(true);
- fut.get();
+ gridAndCacheAccessFut.get();
}
/**
@@ -137,13 +154,10 @@ public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCom
*
*/
private static class HangingCacheStore extends CacheStoreAdapter<Integer, Integer> {
- /** */
- private CountDownLatch releaseLatch = new CountDownLatch(1);
-
/** {@inheritDoc} */
@Override public Integer load(Integer key) throws CacheLoaderException {
- if (key == 3)
- throw new CacheLoaderException();
+ if (key == FAILING_KEY)
+ throw new TestCacheLoaderExpectedException();
return key;
}
@@ -158,4 +172,14 @@ public class GridCachePartitionEvictionDuringReadThroughSelfTest extends GridCom
}
}
+
+ /**
+ *
+ */
+ private static class TestCacheLoaderExpectedException extends CacheLoaderException {
+ /** {@inheritDoc} to reduce amount of logging, trace is not filled */
+ @Override public synchronized Throwable fillInStackTrace() {
+ return this;
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d2cb2f79/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
index dab2b19..953c789 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java
@@ -94,7 +94,6 @@ public class IgniteCacheTestSuite5 extends TestSuite {
suite.addTestSuite(GridCachePartitionExchangeManagerHistSizeTest.class);
- suite.addTestSuite(GridCachePartitionEvictionDuringReadThroughSelfTest.class);
suite.addTestSuite(NotMappedPartitionInTxTest.class);
return suite;
http://git-wip-us.apache.org/repos/asf/ignite/blob/d2cb2f79/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
index 771e974..8bc2c78 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite6.java
@@ -19,10 +19,10 @@ package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.cache.distributed.CachePartitionStateTest;
+import org.apache.ignite.internal.processors.cache.distributed.GridCachePartitionEvictionDuringReadThroughSelfTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeMultiServerTest;
import org.apache.ignite.internal.processors.cache.distributed.IgniteOptimisticTxSuspendResumeTest;
import org.apache.ignite.internal.processors.cache.distributed.IgnitePessimisticTxSuspendResumeTest;
-
/**
* Test suite.
*/
@@ -36,6 +36,7 @@ public class IgniteCacheTestSuite6 extends TestSuite {
suite.addTestSuite(CachePartitionStateTest.class);
+ suite.addTestSuite(GridCachePartitionEvictionDuringReadThroughSelfTest.class);
suite.addTestSuite(IgniteOptimisticTxSuspendResumeTest.class);
suite.addTestSuite(IgniteOptimisticTxSuspendResumeMultiServerTest.class);
suite.addTestSuite(IgnitePessimisticTxSuspendResumeTest.class);