[lucene-solr] branch jira/solr15138-3 updated: new SolrCore()

[no...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

noble pushed a commit to branch jira/solr15138-3
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr15138-3 by this push:
     new a213940fc7a new SolrCore()
a213940fc7a is described below

commit a213940fc7a45d2dc93522b410413dbcd4754860
Author: Noble Paul <no...@gmail.com>
AuthorDate: Tue Jun 21 22:13:42 2022 +1000

    new SolrCore()
---
 solr/core/src/java/org/apache/solr/core/CoreContainer.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 7c7e9e47b5f..8efaaabccb7 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1345,15 +1345,11 @@ public class CoreContainer {
         SolrCore core;
 
         try {
-          Timer.TLInst.start("waitAddPendingCoreOps()");
           solrCores.waitAddPendingCoreOps(cd.getName());
-          Timer.TLInst.end("waitAddPendingCoreOps()");
           Timer.TLInst.start("createFromDescriptor()");
           core = createFromDescriptor(cd, true, newCollection);
           Timer.TLInst.end("createFromDescriptor()");
-          Timer.TLInst.start("coresLocator.persist()");
           coresLocator.persist(this, cd); // Write out the current core properties in case anything changed when the core was created
-          Timer.TLInst.end("coresLocator.persist()");
         } finally {
           solrCores.removeFromPendingOps(cd.getName());
         }
@@ -1473,7 +1469,9 @@ public class CoreContainer {
         log.info("Creating SolrCore '{}' using configuration from {}, trusted={}", dcore.getName(), coreConfig.getName(), dcore.isConfigSetTrusted());
       }
       try {
+        Timer.TLInst.end("new SolrCore()");
         core = new SolrCore(this, dcore, coreConfig);
+        Timer.TLInst.end("new SolrCore()");
       } catch (SolrException e) {
         core = processCoreCreateException(e, dcore, coreConfig);
       }