GET /_migration/deprecations doesn't check disk watermarks against correct settings values#138115
Merged
alexey-ivanov-es merged 10 commits intoelastic:mainfrom Dec 1, 2025
Merged
Conversation
alexey-ivanov-es
added
>bug
:Core/Infra/Core
elasticsearchmachine
added
v9.2.2
v8.19.8
v9.1.8
v9.3.0
Team:Core/Infra
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
Collaborator
|
Hi @alexey-ivanov-es, I've created a changelog YAML for you. |
mosche
reviewed
Nov 17, 2025
...cation/src/main/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoAction.java
Show resolved
Hide resolved
Contributor
|
sorry, i got distracted... I'll get back to this tomorrow morning @alexey-ivanov-es |
mosche
reviewed
Nov 18, 2025
Contributor
mosche
left a comment
mosche
left a comment
There was a problem hiding this comment.
Looking good, just a few minor nits. But wondering if we should address the testing gap here?
...cation/src/main/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoAction.java
Show resolved
Hide resolved
...cation/src/main/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoAction.java
Outdated
Show resolved
Hide resolved
| public List<DeprecationIssue> nodeSettingsIssues() { | ||
| return nodeSettingsIssues.get(); | ||
| DeprecationIssue watermarkIssue = diskWatermarkIssue.get(); | ||
| List<DeprecationIssue> deprecationIssues = nodeSettingsIssues.get(); |
Contributor
There was a problem hiding this comment.
optional nit, how about better distinguishing between the enhanced nodeSettingsIssues and the ones collected from remote nodes, e.g. renaming the latter to remoteNodeSettingsIssues or similar making it more obvious that it's not the same as nodeSettingsIssues that are ultimately returned
| assertThat(exception.getCause().getMessage(), containsString("boom")); | ||
| } | ||
|
|
||
| public void testCheckDiskLowWatermark() { |
Contributor
There was a problem hiding this comment.
Looks like masterOperation operation isn't covered at all, but obviously that's not new to this PR.
Should that be added? wdyt?
Contributor
Author
There was a problem hiding this comment.
I've added a unit test for it. I wanted to add an integration or REST test, but found it's quite difficult to set up the behavior needed I wanted to test
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
alexey-ivanov-es
added a commit
to alexey-ivanov-es/elasticsearch
that referenced
this pull request
Dec 1, 2025
…rrect settings values (elastic#138115) This change moves the disk watermark check from all nodes to the master node since the check is performed against information in ClusterInfo. Also, it changes what setting values are used - using values from the cluster state if they are set, or from node settings otherwise. There's a potential edge case: in a mixed cluster (e.g. master 9.2.1 (before the fix), other nodes 9.3 (after the fix)), the check wouldn't be performed. However, due to elastic#137004, the check isn't working in the released versions anyway, so this doesn't make things worse. Closes elastic#137005
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 1, 2025
…rrect settings values (#138115) (#138818) This change moves the disk watermark check from all nodes to the master node since the check is performed against information in ClusterInfo. Also, it changes what setting values are used - using values from the cluster state if they are set, or from node settings otherwise. There's a potential edge case: in a mixed cluster (e.g. master 9.2.1 (before the fix), other nodes 9.3 (after the fix)), the check wouldn't be performed. However, due to #137004, the check isn't working in the released versions anyway, so this doesn't make things worse. Closes #137005
alexey-ivanov-es
added a commit
to alexey-ivanov-es/elasticsearch
that referenced
this pull request
Dec 1, 2025
…nst correct settings values (elastic#138115)
alexey-ivanov-es
added a commit
to alexey-ivanov-es/elasticsearch
that referenced
this pull request
Dec 1, 2025
…inst correct settings values (elastic#138115)
Contributor
Author
|
Backported to 8.19 and 9.1 manually |
This was referenced Jan 2, 2026
mamazzol
added a commit
to mamazzol/elasticsearch
that referenced
this pull request
Jan 2, 2026
…introduced in elastic#138115 Skip frozen nodes on disk watermark check(elastic#140118) Solves bug introduced in elastic#138115
mamazzol
added a commit
to mamazzol/elasticsearch
that referenced
this pull request
Jan 2, 2026
…introduced in elastic#138115 Skip frozen nodes on disk watermark check(elastic#140118) Solves bug introduced in elastic#138115
mamazzol
added a commit
to mamazzol/elasticsearch
that referenced
this pull request
Jan 2, 2026
…introduced in elastic#138115 Skip frozen nodes on disk watermark check(elastic#140118) Solves bug introduced in elastic#138115
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jan 2, 2026
…introduced in #138115 (#140118) (#140122) * Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115 Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115 * Use constructor instead of builder for ClusterInfo * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
samxbr
pushed a commit
to samxbr/elasticsearch
that referenced
this pull request
Jan 5, 2026
…introduced in elastic#138115 Skip frozen nodes on disk watermark check(elastic#140118) Solves bug introduced in elastic#138115
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
3 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.
This change moves the disk watermark check from all nodes to the master node since the check is performed against information in
ClusterInfo. Also, it changes what setting values are used - using values from the cluster state if they are set, or from node settings otherwise.There's a potential edge case: in a mixed cluster (e.g. master 9.2.1 (before the fix), other nodes 9.3 (after the fix)), the check wouldn't be performed. However, due to #137004, the check isn't working in the released versions anyway, so this doesn't make things worse.
Closes #137005