kotman12 commented on code in PR #4625:
URL: https://github.com/apache/solr/pull/4625#discussion_r4050402160
##########
solr/core/src/java/org/apache/solr/cloud/Overseer.java:
##########
@@ -453,44 +467,15 @@ private void checkIfIamStillLeader() {
&& (zkController.getCoreContainer().isShutDown() ||
zkController.isClosed())) {
return; // shutting down no need to go further
}
- Stat stat = new Stat();
- final String path = OVERSEER_ELECT + "/leader";
- byte[] data;
- try {
- data = zkClient.getData(path, null, stat);
- } catch (IllegalStateException | KeeperException.NoNodeException e) {
- return;
- } catch (Exception e) {
- log.warn("Error communicating with ZooKeeper", e);
- return;
- }
+ // We only reach here after a QUIT (roles handoff) or an unexpected
crash, i.e. cases where no
+ // Zk reconnect handler will re-drive the election. The rejoin below
cancels our context,
+ // which is what removes our leader registration.
try {
- Map<?, ?> m = (Map<?, ?>) Utils.fromJSON(data);
- String id = (String) m.get(ID);
- if (overseerCollectionConfigSetProcessor.getId().equals(id)) {
- try {
- log.warn(
- "I (id={}) am exiting, but I'm still the leader",
- overseerCollectionConfigSetProcessor.getId());
- zkClient.delete(path, stat.getVersion());
- } catch (KeeperException.BadVersionException e) {
- // no problem ignore it some other Overseer has already taken over
- } catch (Exception e) {
- log.error("Could not delete my leader node {}", path, e);
- }
-
- } else {
- log.info("somebody else (id={}) has already taken up the overseer
position", id);
- }
- } finally {
- // if I am not shutting down, Then I need to rejoin election
- try {
- if (zkController != null &&
!zkController.getCoreContainer().isShutDown()) {
- zkController.rejoinOverseerElection(null, false);
- }
- } catch (Exception e) {
- log.warn("Unable to rejoinElection ", e);
+ if (zkController != null &&
!zkController.getCoreContainer().isShutDown()) {
+ zkController.rejoinOverseerElection(null, false);
Review Comment:
We can probably remove the `zkController != null` check as the `Overseer` is
now only initialized from within a `zkController`. Looks like `zkController`
could be marked final as well.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
