ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [44/49] ignite git commit: ignite-gg-12221 change batch to config array
Date Fri, 02 Jun 2017 17:13:57 GMT
ignite-gg-12221 change batch to config array


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/718b2650
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/718b2650
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/718b2650

Branch: refs/heads/ignite-5398
Commit: 718b2650a5bed97d5e2c07bd5a6cb07d11b9d02a
Parents: 8100f52
Author: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Authored: Wed May 31 14:48:25 2017 +0300
Committer: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Committed: Wed May 31 14:48:25 2017 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheProcessor.java    | 32 +++++---------------
 1 file changed, 7 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/718b2650/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 fa9353e..cf91803 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
@@ -197,7 +197,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     private ConcurrentMap<String, DynamicCacheDescriptor> registeredTemplates = new
ConcurrentHashMap<>();
 
     /** On join batches. */
-    private ConcurrentMap<UUID, DynamicCacheChangeBatch> onJoinBatches = new ConcurrentHashMap<>();
+    private ConcurrentMap<UUID, CacheConfiguration[]> onJoinBatches = new ConcurrentHashMap<>();
 
     /** */
     private IdentityHashMap<CacheStore, ThreadLocal> sesHolders = new IdentityHashMap<>();
@@ -2103,21 +2103,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     /** {@inheritDoc} */
     @Nullable @Override public Serializable collectDiscoveryData(UUID nodeId) {
         if (!sharedCtx.kernalContext().state().active()) {
-            if (ctx.localNodeId().equals(nodeId)) {
-                CacheConfiguration[] cfgs = sharedCtx.gridConfig().getCacheConfiguration();
-
-                List<DynamicCacheChangeRequest> reqs = new ArrayList<>(cfgs.length);
-
-                try {
-                    for (CacheConfiguration cfg : cfgs)
-                        reqs.add(createRequest(cfg, true));
-                }
-                catch (Exception e) {
-                    // Todo
-                }
-
-                return new DynamicCacheChangeBatch(reqs).restartingCaches(Collections.<String>emptySet());
-            }
+            if (ctx.localNodeId().equals(nodeId))
+                return sharedCtx.gridConfig().getCacheConfiguration();
         }
 
         boolean reconnect = ctx.localNodeId().equals(nodeId) && cachesOnDisconnect
!= null;
@@ -2234,14 +2221,12 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                     registeredCaches.clear();
                     registeredTemplates.clear();
                 }
-
-                return;
             }
         }
 
         if (!ctx.state().active()) {
-            if (data instanceof DynamicCacheChangeBatch)
-                onJoinBatches.put(rmtNodeId, (DynamicCacheChangeBatch)data);
+            if (data instanceof CacheConfiguration[])
+                onJoinBatches.put(rmtNodeId, (CacheConfiguration[])data);
 
             return;
         }
@@ -2780,11 +2765,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
         List<CacheConfiguration> cfgs = new ArrayList();
 
-        Collections.addAll(cfgs, ctx.config().getCacheConfiguration());
-
-        for (DynamicCacheChangeBatch batch : onJoinBatches.values())
-            for (DynamicCacheChangeRequest req : batch.requests())
-                cfgs.add(req.startCacheConfiguration());
+        for (CacheConfiguration[] staticCfgs : onJoinBatches.values())
+            Collections.addAll(cfgs, staticCfgs);
 
         if (!ctx.config().isDaemon() &&
             sharedCtx.pageStore() != null &&


Mime
View raw message