Apache Solr open-source search software
SOLR-15830: Ensure SchemaManager releases lock
Kevin Risden9f2dce1d9b56
diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.javaindex 6666c57d7dc..f66d13ca619 100644--- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java@@ -105,7 +105,7 @@ public class SolrConfigHandler extends RequestHandlerBasepublic static final boolean configEditing_disabled =Boolean.getBoolean(CONFIGSET_EDITING_DISABLED_ARG);private static final Map<String, SolrConfig.SolrPluginInfo> namedPlugins;- private Lock reloadLock = new ReentrantLock(true);+ private final Lock reloadLock = new ReentrantLock(true);public Lock getReloadLock() {return reloadLock;diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java b/solr/core/src/java/org/apache/solr/schema/SchemaManager.javaindex de64499349b..5ab9c412f1a 100644--- a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java+++ b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java@@ -132,17 +132,21 @@ public class SchemaManager {SolrConfigHandler configHandler =((SolrConfigHandler) req.getCore().getRequestHandler("/config"));if (configHandler.getReloadLock().tryLock()) {- latestVersion =- ZkController.persistConfigResourceToZooKeeper(- zkLoader,- managedIndexSchema.getSchemaZkVersion(),- managedIndexSchema.getResourceName(),- sw.toString().getBytes(StandardCharsets.UTF_8),- true);- req.getCore()- .getCoreContainer()- .reload(req.getCore().getName(), req.getCore().uniqueId);- break;+ try {+ latestVersion =+ ZkController.persistConfigResourceToZooKeeper(+ zkLoader,+ managedIndexSchema.getSchemaZkVersion(),+ managedIndexSchema.getResourceName(),+ sw.toString().getBytes(StandardCharsets.UTF_8),+ true);+ req.getCore()+ .getCoreContainer()+ .reload(req.getCore().getName(), req.getCore().uniqueId);+ break;+ } finally {+ configHandler.getReloadLock().unlock();+ }} else {log.info("Another reload is in progress. Not doing anything.");}