You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/09 04:33:23 UTC
[lucene-solr] 01/02: @968 Rejoin Overseer election in finally block.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 302c3b26f06772fdcc02fa04a44e086ccc321ee2
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Thu Oct 8 23:31:15 2020 -0500
@968 Rejoin Overseer election in finally block.
---
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 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
index 8959b0e..dcef0d6 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -909,9 +909,12 @@ public class Overseer implements SolrCloseable {
log.info("Overseer (id={}) closing", id);
}
if (context != null) {
- context.close(fromCSUpdateThread);
- if (!closeAndDone) {
- zkController.rejoinOverseerElection(context.electionPath, false);
+ try {
+ context.close(fromCSUpdateThread);
+ } finally {
+ if (!closeAndDone) {
+ zkController.rejoinOverseerElection(context.electionPath, false);
+ }
}
}
}