Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17700: Use core operation lock when unloading core (#3260)

Houston Putman7725ac324592
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d162f4aaf0d..725fe56e615 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -201,6 +201,9 @@ Bug Fixes
current live nodes list is stale. CloudSolrClient now retains the initial configured list of passed URLs as backup
used for fetching cluster state when all live nodes have failed. (Matthew Biscocho via David Smiley, Houston Putman)
+* SOLR-17700: Use Core Operation lock when unloading cores. This fixes errors that occur when a collection deletion and reload
+ occur at the same time. (Houston Putman)
+
Dependency Upgrades
---------------------
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 4a2631c7817..454f45471aa 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -1773,7 +1773,9 @@ public class CoreContainer {
(deleteUnknownCores
? " It will be deleted. See SOLR-13396 for more information."
: ""));
- unload(dcore.getName(), deleteUnknownCores, deleteUnknownCores, deleteUnknownCores);
+ // We alreday have an ongoing CoreOp, so do not wait to start another one
+ unloadWithoutCoreOp(
+ dcore.getName(), deleteUnknownCores, deleteUnknownCores, deleteUnknownCores);
throw e;
}
solrCores.removeCoreDescriptor(dcore);
@@ -2147,7 +2149,22 @@ public class CoreContainer {
*/
public void unload(
String name, boolean deleteIndexDir, boolean deleteDataDir, boolean deleteInstanceDir) {
+ try {
+ solrCores.waitAddPendingCoreOps(name);
+ unloadWithoutCoreOp(name, deleteIndexDir, deleteDataDir, deleteInstanceDir);
+ } finally {
+ solrCores.removeFromPendingOps(name);
+ }
+ }
+ /**
+ * This is the actual logic of unloading a core, but does not obtain a lock on the core for the
+ * operation. This method should only be used internally when "unloading" is required within
+ * another core operation. Otherwise, use the public {@link #unload(String, boolean, boolean,
+ * boolean)} method, which will obtain a core operation lock.
+ */
+ private void unloadWithoutCoreOp(
+ String name, boolean deleteIndexDir, boolean deleteDataDir, boolean deleteInstanceDir) {
CoreDescriptor cd = solrCores.getCoreDescriptor(name);
if (name != null) {