You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ds...@apache.org on 2024/08/28 02:03:15 UTC

(solr) branch main updated: SOLR-17421: Make sure overseer drops leadership after QUIT failure (#2663)

This is an automated email from the ASF dual-hosted git repository.

dsmiley pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 8513516ed39 SOLR-17421: Make sure overseer drops leadership after QUIT failure (#2663)
8513516ed39 is described below

commit 8513516ed39dd3190786aa93bdbe02e608ff7d9d
Author: Pierre Salagnac <82...@users.noreply.github.com>
AuthorDate: Wed Aug 28 04:03:10 2024 +0200

    SOLR-17421: Make sure overseer drops leadership after QUIT failure (#2663)
    
    Overseer might be stopped after a failure of the QUIT operation if we don't give up on leadership.
    At least, this happens if we get a timeout error when closing the thread pool for cluster state updater.  There might be other scenarios.
---
 solr/CHANGES.txt                                       | 3 +++
 solr/core/src/java/org/apache/solr/cloud/Overseer.java | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 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.java
index 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);
             }