Apache Solr open-source search software
SOLR-17716: Handle interrupted exception in SolrCores.waitAddPendingCoreOps. (#3283)
Bruno Roustant7e1f5790b7f4
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex 454f45471aa..c3018ab108c 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -1078,19 +1078,23 @@ public class CoreContainer {coreLoadExecutor.execute(() -> {SolrCore core;+ boolean pendingCoreOpAdded = false;try {if (zkSys.getZkController() != null) {zkSys.getZkController().throwErrorIfReplicaReplaced(cd);}MDCLoggingContext.setCoreDescriptor(this, cd);solrCores.waitAddPendingCoreOps(cd.getName());+ pendingCoreOpAdded = true;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 (pendingCoreOpAdded) {+ solrCores.removeFromPendingOps(cd.getName());+ }if (asyncSolrCoreLoad) {solrCores.markCoreAsNotLoading(cd);}@@ -1610,8 +1614,8 @@ public class CoreContainer {coresLocator.create(this, cd);SolrCore core;+ solrCores.waitAddPendingCoreOps(cd.getName());try {- solrCores.waitAddPendingCoreOps(cd.getName());core = createFromDescriptor(cd, true, newCollection);// Write out the current core properties in case anything changed when the core was// created@@ -2047,8 +2051,8 @@ public class CoreContainer {CoreDescriptor cd = reloadCoreDescriptor(core.getCoreDescriptor());solrCores.addCoreDescriptor(cd);boolean success = false;+ solrCores.waitAddPendingCoreOps(cd.getName());try {- solrCores.waitAddPendingCoreOps(cd.getName());ConfigSet coreConfig = coreConfigService.loadConfigSet(cd);if (log.isInfoEnabled()) {log.info(@@ -2105,8 +2109,8 @@ public class CoreContainer {if (coreId != null) return; // yeah, this core is already reloaded/unloaded return right awayCoreLoadFailure clf = coreInitFailures.get(name);if (clf != null) {+ solrCores.waitAddPendingCoreOps(clf.cd.getName());try {- solrCores.waitAddPendingCoreOps(clf.cd.getName());createFromDescriptor(clf.cd, true, false);} finally {solrCores.removeFromPendingOps(clf.cd.getName());@@ -2149,8 +2153,8 @@ public class CoreContainer {*/public void unload(String name, boolean deleteIndexDir, boolean deleteDataDir, boolean deleteInstanceDir) {+ solrCores.waitAddPendingCoreOps(name);try {- solrCores.waitAddPendingCoreOps(name);unloadWithoutCoreOp(name, deleteIndexDir, deleteDataDir, deleteInstanceDir);} finally {solrCores.removeFromPendingOps(name);diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.javaindex 4ea3974f0f8..39b1f68b155 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCores.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java@@ -346,26 +346,31 @@ public class SolrCores {}}}- if (container.isShutDown()) return null; // Just stop already.+ if (container.isShutDown()) {+ // Just stop already.+ // Seems best to throw a SolrException if shutting down, because returning any value,+ // including null, would mean the waiting is complete.+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Server is shutting down");+ }if (pending) {try {modifyLock.wait();} catch (InterruptedException e) {- return null; // Seems best not to do anything at all if the thread is interrupted+ // Seems best to throw a SolrException if interrupted, because returning any value,+ // including null, would mean the waiting is complete.+ Thread.currentThread().interrupt();+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);}}} while (pending);// We _really_ need to do this within the synchronized block!- if (!container.isShutDown()) {- if (!pendingCoreOps.add(name)) {- log.warn("Replaced an entry in pendingCoreOps {}, we should not be doing this", name);- }- // we might have been _unloading_ the core, so return the core if it was loaded.- return getCoreFromAnyList(name, false);+ if (!pendingCoreOps.add(name)) {+ log.warn("Replaced an entry in pendingCoreOps {}, we should not be doing this", name);}+ // we might have been _unloading_ the core, so return the core if it was loaded.+ return getCoreFromAnyList(name, false);}- return null;}// We should always be removing the first thing in the list with our name! The idea here is to NOT