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/01/26 18:28:46 UTC
[2/7] ignite git commit: ignite-db-x fix
GridCacheDhtPreloadDisabledSelfTest.testDisabledPreloader
ignite-db-x fix GridCacheDhtPreloadDisabledSelfTest.testDisabledPreloader
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0cc13dab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0cc13dab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0cc13dab
Branch: refs/heads/ignite-3477
Commit: 0cc13dab42743a5a24f8347586f8f796bdfac021
Parents: cce91f1
Author: Dmitriy Govorukhin <dg...@gridgain.com>
Authored: Wed Jan 25 15:14:29 2017 +0300
Committer: Dmitriy Govorukhin <dg...@gridgain.com>
Committed: Wed Jan 25 15:14:29 2017 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/service/GridServiceProcessor.java | 4 ++++
.../distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0cc13dab/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index ab04e7e..914c3a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -1593,6 +1593,10 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite
if (!busyLock.enterBusy())
return;
+ //Must check that threadpool was not shutdown.
+ if (depExe.isShutdown())
+ return;
+
try {
final AffinityTopologyVersion topVer;
http://git-wip-us.apache.org/repos/asf/ignite/blob/0cc13dab/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
index 61c7d37..f26eb60 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDisabledSelfTest.java
@@ -25,7 +25,6 @@ import java.util.List;
import javax.cache.Cache;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.cluster.ClusterNode;
@@ -186,7 +185,7 @@ public class GridCacheDhtPreloadDisabledSelfTest extends GridCommonAbstractTest
for (int i = 0; i < keyCnt; i++) {
assertNull(near(cache1).peekEx(i));
- assertNotNull((dht(cache1).peekEx(i)));
+ assertNotNull((dht(cache1).localPeek(i, null, null)));
assertEquals(Integer.toString(i), cache1.localPeek(i));
}