Fix test race condition in file settings monitoring#137965
Merged
rjernst merged 4 commits intoelastic:mainfrom Nov 18, 2025
Merged
Fix test race condition in file settings monitoring#137965rjernst merged 4 commits intoelastic:mainfrom
rjernst merged 4 commits intoelastic:mainfrom
Conversation
When file settings tests look for changes in cluster state to assert application of changes they do so by adding a cluster state listener. But if there are no more cluster state updates after the listener is added the test will never see the initial state of file settings. This commit ensures the current cluster state is seen in that case. closes elastic#36454
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
prdoyle
approved these changes
Nov 12, 2025
Contributor
prdoyle
left a comment
There was a problem hiding this comment.
One more race condition down.
| if (reservedState != null && reservedState.version() == fileSettingsVersion) { | ||
| clusterService.removeListener(this); | ||
| metadataVersion.set(event.state().metadata().version()); | ||
| metadataVersion.set(clusterState.metadata().version()); |
Contributor
There was a problem hiding this comment.
Do I understand this correctly? If the reserved state version is the one we're expecting, we infer that the metadata version must also be the one we're expecting, on the assumption that the latest metadata update was the one that updated the reserved state. This seems ok in these particular tests where there are very few metadata updates, even though it wouldn't be correct in general.
Am I close?
Did you manage to induce this logic path with sleeps in the tests that call this method?
Member
Author
There was a problem hiding this comment.
We don't assert anything about the metadata version, this captures the metadata version once we see the file settings version we expect.
And yes I reproduced with a sleep just before creating the state listener.
mamazzol
approved these changes
Nov 13, 2025
This was referenced Nov 18, 2025
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Nov 18, 2025
When file settings tests look for changes in cluster state to assert application of changes they do so by adding a cluster state listener. But if there are no more cluster state updates after the listener is added the test will never see the initial state of file settings. This commit ensures the current cluster state is seen in that case. closes elastic#36454
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Nov 18, 2025
When file settings tests look for changes in cluster state to assert application of changes they do so by adding a cluster state listener. But if there are no more cluster state updates after the listener is added the test will never see the initial state of file settings. This commit ensures the current cluster state is seen in that case. closes elastic#36454
elasticsearchmachine
pushed a commit
that referenced
this pull request
Nov 18, 2025
When file settings tests look for changes in cluster state to assert application of changes they do so by adding a cluster state listener. But if there are no more cluster state updates after the listener is added the test will never see the initial state of file settings. This commit ensures the current cluster state is seen in that case. closes #36454
elasticsearchmachine
pushed a commit
that referenced
this pull request
Nov 18, 2025
When file settings tests look for changes in cluster state to assert application of changes they do so by adding a cluster state listener. But if there are no more cluster state updates after the listener is added the test will never see the initial state of file settings. This commit ensures the current cluster state is seen in that case. closes #36454
This was referenced Dec 9, 2025
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
4 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.
When file settings tests look for changes in cluster state to assert application of changes they do so by adding a cluster state listener. But if there are no more cluster state updates after the listener is added the test will never see the initial state of file settings. This commit ensures the current cluster state is seen in that case.
closes #36454