This is an automated email from the ASF dual-hosted git repository. ishan pushed a commit to branch jira/SOLR15694 in repository https://gitbox.apache.org/repos/asf/solr.git
commit be6efc2520bb00421800d49eb5b0082e4a1e65b8 Author: Noble Paul <[email protected]> AuthorDate: Fri Dec 17 16:37:59 2021 +1100 removed unnecessary changes --- solr/core/src/java/org/apache/solr/cloud/ZkController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index 33ea43d..a249e4f 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java @@ -685,9 +685,7 @@ public class ZkController implements Closeable { } finally { // just in case the OverseerElectionContext managed to start another Overseer - if(overseer != null) { - IOUtils.closeQuietly(overseer); - } + IOUtils.closeQuietly(overseer); ExecutorUtil.shutdownAndAwaitTermination(customThreadPool); } @@ -913,7 +911,7 @@ public class ZkController implements Closeable { registerLiveNodesListener(); // start the overseer first as following code may need it's processing - if (!zkRunOnly && cc.nodeRoles.isOverseerAllowed()) { + if (!zkRunOnly) { overseerElector = new LeaderElector(zkClient); this.overseer = new Overseer((HttpShardHandler) cc.getShardHandlerFactory().getShardHandler(), cc.getUpdateShardHandler(), CommonParams.CORES_HANDLER_PATH, zkStateReader, this, cloudConfig);
