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 2017/07/03 14:41:13 UTC
ignite git commit: ignite-gg-12389
Repository: ignite
Updated Branches:
refs/heads/ignite-gg-12389 0ff1a987e -> 2b69debe9
ignite-gg-12389
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b69debe
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b69debe
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b69debe
Branch: refs/heads/ignite-gg-12389
Commit: 2b69debe920fe75874d8bf401a71206ba7f52a11
Parents: 0ff1a98
Author: sboikov <sb...@gridgain.com>
Authored: Mon Jul 3 17:11:04 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Jul 3 17:37:50 2017 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 4 +++-
.../persistence/GridCacheOffheapManager.java | 5 +----
...terActivateDeactivateTestWithPersistence.java | 19 +++++++++++++++++++
3 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b69debe/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index b38c1c0..88f7dd1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -701,7 +701,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
discoWrk.discoCache = discoCache;
- if (!isLocDaemon)
+ if (!isLocDaemon && !ctx.clientDisconnected())
ctx.cache().context().exchange().onLocalJoin(discoEvt, discoCache);
locJoin.onDone(new DiscoveryLocalJoinData(discoEvt,
@@ -748,6 +748,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
((IgniteKernal)ctx.grid()).onReconnected(clusterRestarted);
+ ctx.cache().context().exchange().onLocalJoin(localJoinEvent(), discoCache);
+
ctx.cluster().clientReconnectFuture().listen(new CI1<IgniteFuture<?>>() {
@Override public void apply(IgniteFuture<?> fut) {
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b69debe/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
index 4e322b9..7a38b61 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java
@@ -135,10 +135,7 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple
/** {@inheritDoc} */
@Override protected CacheDataStore createCacheDataStore0(final int p)
throws IgniteCheckedException {
- GridCacheDatabaseSharedManager dbMgr = (GridCacheDatabaseSharedManager)ctx.database();
-
- boolean exists = ctx.pageStore() != null
- && ctx.pageStore().exists(grp.groupId(), p);
+ boolean exists = ctx.pageStore() != null && ctx.pageStore().exists(grp.groupId(), p);
return new GridCacheDataStore(p, exists);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2b69debe/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
index aad598f..8d72752 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTestWithPersistence.java
@@ -18,7 +18,10 @@
package org.apache.ignite.internal.processors.cache;
import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
import org.apache.ignite.Ignite;
+import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.testframework.GridTestUtils;
/**
@@ -84,6 +87,16 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
srv.createCaches(Arrays.asList(cacheConfigurations1()));
+ Map<Integer, Integer> cacheData = new LinkedHashMap<>();
+
+ for (int i = 1; i <= 100; i++) {
+ for (CacheConfiguration ccfg : cacheConfigurations1()) {
+ srv.cache(ccfg.getName()).put(-i, i);
+
+ cacheData.put(-i, i);
+ }
+ }
+
stopAllGrids();
for (int i = 0; i < srvs; i++) {
@@ -106,6 +119,9 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
checkCache(ignite(i), CACHE_NAME_PREFIX + c, true);
}
+ for (CacheConfiguration ccfg : cacheConfigurations1())
+ checkCacheData(cacheData, ccfg.getName());
+
checkCaches(srvs, CACHES);
int nodes = srvs;
@@ -134,5 +150,8 @@ public class IgniteClusterActivateDeactivateTestWithPersistence extends IgniteCl
for (int c = 0; c < CACHES; c++)
checkCache(ignite(i), CACHE_NAME_PREFIX + c, true);
}
+
+ for (CacheConfiguration ccfg : cacheConfigurations1())
+ checkCacheData(cacheData, ccfg.getName());
}
}