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/21 13:42:20 UTC
ignite git commit: Better kernal start callback placement.
Repository: ignite
Updated Branches:
refs/heads/ignite-4565-ddl 9f7b8aba4 -> 19d61669e
Better kernal start callback placement.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19d61669
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19d61669
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19d61669
Branch: refs/heads/ignite-4565-ddl
Commit: 19d61669eff0d53e418a16764e5dcc23300c24a0
Parents: 9f7b8ab
Author: devozerov <vo...@gridgain.com>
Authored: Tue Mar 21 16:42:12 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Mar 21 16:42:12 2017 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheProcessor.java | 2 ++
.../internal/processors/query/GridQueryProcessor.java | 14 ++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/19d61669/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 2aa004c..bde7ff9 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
@@ -874,6 +874,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache, null, false));
}
}
+
+ ctx.query().onCacheKernalStart();
}
finally {
cacheStartedLatch.countDown();
http://git-wip-us.apache.org/repos/asf/ignite/blob/19d61669/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 3c1a8ab..9d98115 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -184,10 +184,16 @@ public class GridQueryProcessor extends GridProcessorAdapter {
}, QRY_DETAIL_METRICS_EVICTION_FREQ, QRY_DETAIL_METRICS_EVICTION_FREQ);
}
- /** {@inheritDoc} */
- @Override public void onKernalStart() throws IgniteCheckedException {
- super.onKernalStart();
-
+ /**
+ * Handle cache kernal start. At this point discovery and IO managers are operational,
+ * GridCacheProcessor.onKernalStart() registered caches received on discovery stage, but exchange worker is not
+ * started.
+ * <p>
+ * At this point we allow concurrent IO messages handling as initial cache state is consistent.
+ *
+ * @throws IgniteCheckedException If failed.
+ */
+ public void onCacheKernalStart() throws IgniteCheckedException {
// Start IO worker to consume racy IO messages.
boolean startIoWorker = false;