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 2015/09/03 23:43:18 UTC
[09/39] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.3.3-p7' into ignite-1.4
Merge remote-tracking branch 'remotes/origin/ignite-1.3.3-p7' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7809d262
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7809d262
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7809d262
Branch: refs/heads/ignite-264
Commit: 7809d262931bf6231b6a96ec2bf247a05cb4cecf
Parents: ba756cd 81e0c40
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 2 13:59:44 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 2 13:59:44 2015 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 52 ++++--
.../cache/DynamicCacheChangeRequest.java | 19 +-
.../cache/DynamicCacheDescriptor.java | 16 +-
.../GridCachePartitionExchangeManager.java | 4 +-
.../processors/cache/GridCacheProcessor.java | 187 +++++++++----------
.../cache/IgniteDynamicCacheStartSelfTest.java | 4 +-
6 files changed, 142 insertions(+), 140 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7809d262/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7809d262/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheChangeRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7809d262/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7809d262/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7809d262/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c5f8168,687c987..57c1977
--- 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
@@@ -1837,22 -1673,16 +1802,20 @@@ public class GridCacheProcessor extend
Collection<DynamicCacheChangeRequest> reqs =
new ArrayList<>(registeredCaches.size() + registeredTemplates.size());
- for (DynamicCacheDescriptor desc : registeredCaches.values()) {
+ boolean reconnect = ctx.localNodeId().equals(nodeId) && cachesOnDisconnect != null;
+
+ Map<String, DynamicCacheDescriptor> descs = reconnect ? cachesOnDisconnect : registeredCaches;
+
+ for (DynamicCacheDescriptor desc : descs.values()) {
- if (!desc.cancelled()) {
- DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(desc.cacheConfiguration().getName(), null);
+ DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(desc.cacheConfiguration().getName(), null);
- req.startCacheConfiguration(desc.cacheConfiguration());
+ req.startCacheConfiguration(desc.cacheConfiguration());
- req.cacheType(desc.cacheType());
+ req.cacheType(desc.cacheType());
- req.deploymentId(desc.deploymentId());
+ req.deploymentId(desc.deploymentId());
- reqs.add(req);
- }
+ reqs.add(req);
}
for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/7809d262/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------