Do not use a separate thread to check overseer leadership. We want to…

… be interrupted
apache · Oct 23, 2024 · 44199a9 · 44199a9
1 parent 99e17e3
commit 44199a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -414,7 +414,7 @@ public void run() {
           log.info("Overseer Loop exiting : {}", LeaderElector.getNodeName(myId));
         }
         // do this in a separate thread because any wait is interrupted in this main thread
-        new Thread(this::checkIfIamStillLeader, "OverseerExitThread").start();
+        checkIfIamStillLeader();
       }
     }
 

diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -697,7 +697,9 @@ public void preClose() {
     this.isClosed = true;
 
     try {
-      this.removeEphemeralLiveNode();
+      if (getZkClient().isConnected()) {
+        this.removeEphemeralLiveNode();
+      }
     } catch (IllegalStateException
         | SessionExpiredException
         | KeeperException.ConnectionLossException e) {