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 2016/12/16 11:42:09 UTC
[40/49] ignite git commit: ignite-4411 Changed test to avoid
deadlocks when striped pool is used.
ignite-4411 Changed test to avoid deadlocks when striped pool is used.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a62d533
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a62d533
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a62d533
Branch: refs/heads/ignite-2.0
Commit: 9a62d53326f857540ff91e484550150cf4936043
Parents: 7cc495b
Author: sboikov <sb...@gridgain.com>
Authored: Thu Dec 15 12:15:22 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Dec 15 12:15:22 2016 +0300
----------------------------------------------------------------------
...achePartitionedMultiNodeFullApiSelfTest.java | 37 ++++++++++++++++----
1 file changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a62d533/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
index 71b14eb..34b67bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiNodeFullApiSelfTest.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.Callable;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteAtomicLong;
import org.apache.ignite.IgniteCache;
@@ -37,10 +38,12 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.events.Event;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteKernal;
+import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.resources.LoggerResource;
+import org.apache.ignite.testframework.GridTestUtils;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
import static org.apache.ignite.cache.CacheMode.REPLICATED;
@@ -194,7 +197,7 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
for (int i = 0; i < gridCount(); i++)
grid(i).events().localListen(
- new SwapUnswapLocalListener(), EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED);
+ new SwapUnswapLocalListener(), EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED);
jcache().put("key", 1);
@@ -202,13 +205,19 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
if (grid(i).affinity(null).isBackup(grid(i).localNode(), "key")) {
jcache(i).localEvict(Collections.singleton("key"));
- assert jcache(i).localPeek("key", ONHEAP) == null;
+ assertNull(jcache(i).localPeek("key", ONHEAP));
- assert jcache(i).get("key") == 1;
+ assertEquals((Integer)1, jcache(i).get("key"));
+
+ GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ @Override public boolean apply() {
+ return swapEvts.get() == 1 && unswapEvts.get() == 1;
+ }
+ }, 5000);
- assert swapEvts.get() == 1 : "Swap events: " + swapEvts.get();
+ assertEquals(1, swapEvts.get());
- assert unswapEvts.get() == 1 : "Unswap events: " + unswapEvts.get();
+ assertEquals(1, unswapEvts.get());
break;
}
@@ -464,11 +473,25 @@ public class GridCachePartitionedMultiNodeFullApiSelfTest extends GridCacheParti
switch (evt.type()) {
case EVT_CACHE_OBJECT_SWAPPED:
- ignite.atomicLong("swapEvts", 0, false).incrementAndGet();
+ // Run from another thread to avoid deadlock with striped pool.
+ GridTestUtils.runAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.atomicLong("swapEvts", 0, false).incrementAndGet();
+
+ return null;
+ }
+ });
break;
case EVT_CACHE_OBJECT_UNSWAPPED:
- ignite.atomicLong("unswapEvts", 0, false).incrementAndGet();
+ // Run from another thread to avoid deadlock with striped pool.
+ GridTestUtils.runAsync(new Callable<Void>() {
+ @Override public Void call() throws Exception {
+ ignite.atomicLong("unswapEvts", 0, false).incrementAndGet();
+
+ return null;
+ }
+ });
break;
}