You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/17 11:59:10 UTC
ignite git commit: Correct index state propagation for discovery.
Repository: ignite
Updated Branches:
refs/heads/ignite-4565-ddl 4376670bb -> 636048f33
Correct index state propagation for discovery.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/636048f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/636048f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/636048f3
Branch: refs/heads/ignite-4565-ddl
Commit: 636048f3301ae1c8dede24ea48f8d287d9963852
Parents: 4376670
Author: devozerov <vo...@gridgain.com>
Authored: Fri Mar 17 14:59:02 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Fri Mar 17 14:59:02 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/636048f3/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 8ae3283..0a33634 100755
--- 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
@@ -1647,6 +1647,11 @@ public class GridCacheProcessor extends GridProcessorAdapter {
assert req.start() : req;
assert req.cacheType() != null : req;
+ DynamicCacheDescriptor desc = cacheDescriptor(req.cacheName());
+
+ if (desc != null)
+ desc.onStart();
+
prepareCacheStart(
req.startCacheConfiguration(),
req.nearCacheConfiguration(),
@@ -1655,13 +1660,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
req.initiatingNodeId(),
req.deploymentId(),
topVer,
- req.indexStates()
+ desc != null ? desc.indexStatesForStart() : null
);
-
- DynamicCacheDescriptor desc = cacheDescriptor(req.cacheName());
-
- if (desc != null)
- desc.onStart();
}
/**