Apache Solr open-source search software
SOLR-16577: Always log core load issues (#1221)
Haythemd2e7814254aa
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex e24ccafae2f..68d6924b608 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -121,6 +121,8 @@ Improvements* SOLR-17094: Close objects contained inside an ObjectCache. (Vincent Primault)+* SOLR-16577: Ensure core load failures are always logged. (Haythem Khiri, David Smiley)+Optimizations---------------------* SOLR-17084: LBSolrClient (used by CloudSolrClient) now returns the count of core tracked as not live AKA zombiesdiff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex 551608ca733..6681e71c814 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -36,7 +36,6 @@ import java.lang.invoke.MethodHandles;import java.nio.file.Path;import java.nio.file.Paths;import java.text.SimpleDateFormat;-import java.util.ArrayList;import java.util.Arrays;import java.util.Collections;import java.util.Date;@@ -49,9 +48,7 @@ import java.util.Properties;import java.util.Set;import java.util.UUID;import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.ExecutionException;import java.util.concurrent.ExecutorService;-import java.util.concurrent.Future;import java.util.concurrent.TimeoutException;import java.util.function.Function;import java.util.function.Supplier;@@ -1027,7 +1024,6 @@ public class CoreContainer {null,new Class<?>[] {CoreContainer.class},new Object[] {this});- final List<Future<SolrCore>> futures = new ArrayList<>();try {List<CoreDescriptor> cds = coresLocator.discover(this);cds = coreSorter.sort(cds);@@ -1041,29 +1037,34 @@ public class CoreContainer {solrCores.markCoreAsLoading(cd);}if (cd.isLoadOnStartup()) {- futures.add(- coreLoadExecutor.submit(- () -> {- SolrCore core;- try {- if (zkSys.getZkController() != null) {- zkSys.getZkController().throwErrorIfReplicaReplaced(cd);- }- solrCores.waitAddPendingCoreOps(cd.getName());- core = createFromDescriptor(cd, false, false);- } finally {- solrCores.removeFromPendingOps(cd.getName());- if (asyncSolrCoreLoad) {- solrCores.markCoreAsNotLoading(cd);- }- }- try {- zkSys.registerInZk(core, true, false);- } catch (RuntimeException e) {- log.error("Error registering SolrCore", e);- }- return core;- }));+ coreLoadExecutor.submit(+ () -> {+ SolrCore core;+ try {+ if (zkSys.getZkController() != null) {+ zkSys.getZkController().throwErrorIfReplicaReplaced(cd);+ }+ MDCLoggingContext.setCoreDescriptor(this, cd);+ solrCores.waitAddPendingCoreOps(cd.getName());+ core = createFromDescriptor(cd, false, false);+ } catch (Exception e) {+ log.error("SolrCore failed to load on startup", e);+ MDCLoggingContext.clear();+ return;+ } finally {+ solrCores.removeFromPendingOps(cd.getName());+ if (asyncSolrCoreLoad) {+ solrCores.markCoreAsNotLoading(cd);+ }+ }+ try {+ zkSys.registerInZk(core, true, false);+ } catch (RuntimeException e) {+ log.error("Error registering SolrCore", e);+ } finally {+ MDCLoggingContext.clear();+ }+ });}}@@ -1072,24 +1073,9 @@ public class CoreContainer {backgroundCloser.start();} finally {- if (asyncSolrCoreLoad && futures != null) {-+ if (asyncSolrCoreLoad) {coreContainerWorkExecutor.submit(- () -> {- try {- for (Future<SolrCore> future : futures) {- try {- future.get();- } catch (InterruptedException e) {- Thread.currentThread().interrupt();- } catch (ExecutionException e) {- log.error("Error waiting for SolrCore to be loaded on startup", e);- }- }- } finally {- ExecutorUtil.shutdownAndAwaitTermination(coreLoadExecutor);- }- });+ () -> ExecutorUtil.shutdownAndAwaitTermination(coreLoadExecutor));} else {ExecutorUtil.shutdownAndAwaitTermination(coreLoadExecutor);}