[lucene-solr] branch reference_impl_dev updated: @1325 Tweak SolrCore init ordering.

[ma...@apache.org]

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


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new 2d1e6ef  @1325 Tweak SolrCore init ordering.
2d1e6ef is described below

commit 2d1e6efe61b11f4e9eff187ab0a5595e379e401e
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Feb 3 12:57:35 2021 -0600

    @1325 Tweak SolrCore init ordering.
---
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 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 ba54f4b..65061cf 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1041,6 +1041,8 @@ public final class SolrCore implements SolrInfoBean, Closeable {
       this.resourceLoader = configSet.getSolrConfig().getResourceLoader();
       this.configSetProperties = configSet.getProperties();
 
+      setLatestSchema(schema);
+
       // Initialize the RestManager
       StopWatch initRestManager = new StopWatch(this + "-initRestManager");
       restManager = initRestManager(cd);
@@ -1082,7 +1084,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {
 
       StopWatch timeVerInSchema = new StopWatch(this + "-verInSchema");
       checkVersionFieldExistsInSchema(schema, coreDescriptor);
-      setLatestSchema(schema);
       timeVerInSchema.done();
 
       SolrFieldCacheBean solrFieldCacheBean = new SolrFieldCacheBean();
@@ -1210,22 +1211,20 @@ public final class SolrCore implements SolrInfoBean, Closeable {
       StopWatch timeLoadSearchComponents = new StopWatch(this + "-startCore-loadSearchComponents");
       loadSearchComponents();
       timeLoadSearchComponents.done();
+
       updateProcessors.init(Collections.emptyMap(), this);
 
       // Processors initialized before the handlers
       updateProcessorChains = loadUpdateProcessorChains();
 
-      StopWatch timeInform = new StopWatch(this + "-startCore-inform");
-      // Finally tell anyone who wants to know
-      resourceLoader.inform(resourceLoader);
-
-      this.updateHandler.informEventListeners(this);
-      timeInform.done();
-
-
       future.get();
 
+      // Finally tell anyone who wants to know
+      StopWatch timeInform = new StopWatch(this + "-startCore-inform");
+      this.updateHandler.informEventListeners(this);
+      resourceLoader.inform(resourceLoader);
       resourceLoader.inform(this); // last call before the latch is released.
+      timeInform.done();
 
       searcherReadyLatch.countDown();
       // this must happen after the latch is released, because a JMX server impl may