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/04/27 15:15:57 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-2.0' into ignite-5075-cacheStart
Repository: ignite
Updated Branches:
refs/heads/ignite-5075-cacheStart ab92ab2ea -> 82f3a2fc3
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-5075-cacheStart
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/82f3a2fc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/82f3a2fc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/82f3a2fc
Branch: refs/heads/ignite-5075-cacheStart
Commit: 82f3a2fc377494ab7f3291e61f7e5a77052b8f40
Parents: ab92ab2
Author: sboikov <sb...@gridgain.com>
Authored: Thu Apr 27 18:13:42 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Apr 27 18:13:42 2017 +0300
----------------------------------------------------------------------
.../processors/cache/CacheAffinitySharedManager.java | 14 ++++++++------
.../internal/processors/cache/GridCacheProcessor.java | 4 ++--
2 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/82f3a2fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index d3749f4..60eeef0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -435,16 +435,18 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap
cctx.cache().blockGateway(req);
- CacheHolder cache = caches.remove(cacheId);
+ if (crd) {
+ CacheHolder cache = caches.remove(cacheId);
- assert cache != null : req;
+ assert cache != null : req;
- if (stoppedCaches == null)
- stoppedCaches = new HashSet<>();
+ if (stoppedCaches == null)
+ stoppedCaches = new HashSet<>();
- stoppedCaches.add(cache.cacheId());
+ stoppedCaches.add(cache.cacheId());
- cctx.io().removeHandler(cacheId, GridDhtAffinityAssignmentResponse.class);
+ cctx.io().removeHandler(cacheId, GridDhtAffinityAssignmentResponse.class);
+ }
}
if (stoppedCaches != null) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/82f3a2fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index cfc267e..a68d174 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -2018,8 +2018,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
sharedCtx.removeCacheContext(ctx);
- assert req.deploymentId().equals(ctx.dynamicDeploymentId()) : "Different deployment IDs [req=" + req +
- ", ctxDepId=" + ctx.dynamicDeploymentId() + ']';
+// assert req.deploymentId().equals(ctx.dynamicDeploymentId()) : "Different deployment IDs [req=" + req +
+// ", ctxDepId=" + ctx.dynamicDeploymentId() + ']';
onKernalStop(cache, req.destroy());