You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/11/09 15:14:12 UTC
[lucene-solr] 01/02: @1116 Inc ref core state last,
init rest manager sooner.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit f4aa65b6e77dfa9255d2ec5ab7a43576aedcf1d5
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Nov 9 08:56:23 2020 -0600
@1116 Inc ref core state last, init rest manager sooner.
---
solr/core/src/java/org/apache/solr/core/SolrCore.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index d6caa54..bded8f3 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -976,10 +976,8 @@ public final class SolrCore implements SolrInfoBean, Closeable {
this.coreContainer = coreContainer;
+
try {
- if (reload) {
- updateHandler.getSolrCoreState().increfSolrCoreState();
- }
IndexSchema schema = configSet.getIndexSchema();
@@ -991,11 +989,16 @@ public final class SolrCore implements SolrInfoBean, Closeable {
this.solrConfig = configSet.getSolrConfig();
this.resourceLoader = configSet.getSolrConfig().getResourceLoader();
this.configSetProperties = configSet.getProperties();
+
+ // Initialize the RestManager
+ restManager = initRestManager(cd);
+
// Initialize the metrics manager
this.coreMetricManager = initCoreMetricManager(solrConfig);
solrMetricsContext = coreMetricManager.getSolrMetricsContext();
this.coreMetricManager.loadReporters();
+
if (updateHandler == null) {
directoryFactory = initDirectoryFactory();
recoveryStrategyBuilder = initRecoveryStrategyBuilder();
@@ -1068,9 +1071,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
initSearcher(prev);
- // Initialize the RestManager
- restManager = initRestManager(cd);
-
// Finally tell anyone who wants to know
resourceLoader.inform(resourceLoader);
@@ -1105,9 +1105,13 @@ public final class SolrCore implements SolrInfoBean, Closeable {
searcherReadyLatch.countDown();
// seed version buckets with max from index during core initialization ... requires a searcher!
- //if (!reload) { // reload could move to a different index
+ //if (!reload) { // TODO: reload could move to a different index?
seedVersionBuckets();
// }
+
+ if (reload) {
+ updateHandler.getSolrCoreState().increfSolrCoreState();
+ }
} catch (Throwable e) {
log.error("Error while creating SolrCore", e);
// release the latch, otherwise we block trying to do the close. This