Apache Solr open-source search software
SOLR-17421: Make sure overseer drops leadership after QUIT failure (#2663)
Pierre Salagnac8513516ed39d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex ec1d7b2520a..2a30bfa985a 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -135,6 +135,9 @@ Bug Fixes---------------------* SOLR-12429: Uploading a configset with a symbolic link produces a IOException. Now a error message to user generated instead. (Eric Pugh)+* SOLR-17421: Fixed a rare case where overseer was stuck after a failure when changing overseer to honor the+ node role for preferred overseer. (Pierre Salagnac)+Dependency Upgrades---------------------(No changes)diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.javaindex a57270c23db..bd91a226a5d 100644--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java@@ -593,8 +593,8 @@ public class Overseer implements SolrCloseable {if (log.isInfoEnabled()) {log.info("Quit command received {} {}", message, LeaderElector.getNodeName(myId));}- overseerCollectionConfigSetProcessor.close();- close();+ IOUtils.closeQuietly(overseerCollectionConfigSetProcessor);+ IOUtils.closeQuietly(this);} else {log.warn("Overseer received wrong QUIT message {}", message);}