Handle master failure in NodeSeenService#77220
Merged
elasticsearchmachine merged 5 commits intoelastic:masterfrom Sep 9, 2021
Merged
Handle master failure in NodeSeenService#77220elasticsearchmachine merged 5 commits intoelastic:masterfrom
elasticsearchmachine merged 5 commits intoelastic:masterfrom
Conversation
NodeSeenService can miss seeing nodes if the master changes while it's processing the cluster state update which adds the nodes to the cluster. This caused occasional test failures in the test intended to check that NodeSeenService is working as intended. This commit adjusts NodeSeenService's early returns to ensure that, if the master changed, the new master checks for seen nodes even if nodes were not added in that particular cluster state update.
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
Contributor
Author
|
Prior to the change to |
Contributor
Author
|
@dakrone I realized that I was missing an |
dakrone
approved these changes
Sep 8, 2021
Member
dakrone
left a comment
There was a problem hiding this comment.
Thanks for clarifying it by pulling it into a variable, after removing the logging it LGTM
| final boolean thisNodeJustBecameMaster = event.previousState().nodes().isLocalNodeElectedMaster() == false | ||
| && event.state().nodes().isLocalNodeElectedMaster(); | ||
| if ((event.nodesAdded() || thisNodeJustBecameMaster) == false) { | ||
| logger.error("GWB> Bailing early"); |
Member
There was a problem hiding this comment.
We should probably remove this line :)
Contributor
Author
There was a problem hiding this comment.
Whoops, I had those in there to help verify my reading that the == false was missing 🤦
Removed.
| .collect(Collectors.toUnmodifiableSet()); | ||
|
|
||
| if (nodesNotPreviouslySeen.isEmpty() == false) { | ||
| logger.error("GWB> Submitting update task for nodes [{}]", nodesNotPreviouslySeen); |
|
|
||
| final NodesShutdownMetadata newNodesMetadata = new NodesShutdownMetadata(newShutdownMetadataMap); | ||
| if (newNodesMetadata.equals(currentShutdownMetadata)) { | ||
| logger.error("GWB> Bailing update task as it's a no-op"); |
Contributor
Author
|
@elasticmachine update branch |
AthenaEryma
added a commit
to AthenaEryma/elasticsearch
that referenced
this pull request
Sep 9, 2021
* Handle master failure in NodeSeenService NodeSeenService can miss seeing nodes if the master changes while it's processing the cluster state update which adds the nodes to the cluster. This caused occasional test failures in the test intended to check that NodeSeenService is working as intended. This commit adjusts NodeSeenService's early returns to ensure that, if the master changed, the new master checks for seen nodes even if nodes were not added in that particular cluster state update. * Clarify & correct "just-became-master" check * Remove leftover debug logging (d'oh!) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
AthenaEryma
added a commit
to AthenaEryma/elasticsearch
that referenced
this pull request
Sep 9, 2021
* Handle master failure in NodeSeenService NodeSeenService can miss seeing nodes if the master changes while it's processing the cluster state update which adds the nodes to the cluster. This caused occasional test failures in the test intended to check that NodeSeenService is working as intended. This commit adjusts NodeSeenService's early returns to ensure that, if the master changed, the new master checks for seen nodes even if nodes were not added in that particular cluster state update. * Clarify & correct "just-became-master" check * Remove leftover debug logging (d'oh!) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Collaborator
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 9, 2021
* Handle master failure in NodeSeenService NodeSeenService can miss seeing nodes if the master changes while it's processing the cluster state update which adds the nodes to the cluster. This caused occasional test failures in the test intended to check that NodeSeenService is working as intended. This commit adjusts NodeSeenService's early returns to ensure that, if the master changed, the new master checks for seen nodes even if nodes were not added in that particular cluster state update. * Clarify & correct "just-became-master" check * Remove leftover debug logging (d'oh!) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 9, 2021
* Handle master failure in NodeSeenService NodeSeenService can miss seeing nodes if the master changes while it's processing the cluster state update which adds the nodes to the cluster. This caused occasional test failures in the test intended to check that NodeSeenService is working as intended. This commit adjusts NodeSeenService's early returns to ensure that, if the master changed, the new master checks for seen nodes even if nodes were not added in that particular cluster state update. * Clarify & correct "just-became-master" check * Remove leftover debug logging (d'oh!) Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NodeSeenService can miss seeing nodes if the master changes while it's
processing the cluster state update which adds the nodes to the cluster.
This caused occasional test failures in the test intended to check that
NodeSeenService is working as intended.
This commit adjusts NodeSeenService's early returns to ensure that, if
the master changed, the new master checks for seen nodes even if nodes
were not added in that particular cluster state update.
Follow-up to #75750
Fixes #76689