GET /_migration/deprecations doesn't check disk watermarks against correct settings values #138115

alexey-ivanov-es · 2025-11-14T17:41:13Z

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

…rrect settings

elasticsearchmachine · 2025-11-14T17:41:40Z

Pinging @elastic/es-core-infra (Team:Core/Infra)

elasticsearchmachine · 2025-11-14T17:42:04Z

Hi @alexey-ivanov-es, I've created a changelog YAML for you.

...cation/src/main/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoAction.java

mosche · 2025-11-17T16:46:45Z

sorry, i got distracted... I'll get back to this tomorrow morning @alexey-ivanov-es

mosche

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

mosche · 2025-11-17T16:45:50Z

...cation/src/main/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoAction.java

        public List<DeprecationIssue> nodeSettingsIssues() {
-            return nodeSettingsIssues.get();
+            DeprecationIssue watermarkIssue = diskWatermarkIssue.get();
+            List<DeprecationIssue> deprecationIssues = nodeSettingsIssues.get();


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

mosche · 2025-11-18T07:39:48Z

...n/src/test/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoActionTests.java

        assertThat(exception.getCause().getMessage(), containsString("boom"));
    }

+    public void testCheckDiskLowWatermark() {


Looks like masterOperation operation isn't covered at all, but obviously that's not new to this PR.
Should that be added? wdyt?

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

elasticsearchmachine · 2025-12-01T13:52:20Z

💔 Backport failed

Status	Branch	Result
❌	9.1	Commit could not be cherrypicked due to conflicts
❌	8.19	Commit could not be cherrypicked due to conflicts
✅	9.2

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 138115

…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

…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

…nst correct settings values (elastic#138115)

…inst correct settings values (elastic#138115)

…nst correct settings values (#138115) (#138837)

…inst correct settings values (#138115) (#138840) * [8.19] GET /_migration/deprecations doesn't check disk watermarks against correct settings values (#138115) * Fix build

alexey-ivanov-es · 2025-12-01T19:52:08Z

Backported to 8.19 and 9.1 manually

…ced in #138115 Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115

…introduced in elastic#138115 Skip frozen nodes on disk watermark check(elastic#140118) Solves bug introduced in elastic#138115

…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 <[email protected]>

…ntroduced in #138115 (#140118) (#140120) * 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

…ced in #138115 (#140121) Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115

…introduced in elastic#138115 Skip frozen nodes on disk watermark check(elastic#140118) Solves bug introduced in elastic#138115

…ced in #138115 (#140123) Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115

GET /_migration/deprecations doesn't check disk watermarks against co…

58f459a

…rrect settings

alexey-ivanov-es added >bug :Core/Infra/Core Core issues without another label auto-backport Automatically create backport pull requests when merged branch:9.2 branch:9.1 branch:8.19 labels Nov 14, 2025

elasticsearchmachine added v9.2.2 v8.19.8 v9.1.8 v9.3.0 Team:Core/Infra Meta label for core/infra team labels Nov 14, 2025

elasticsearchmachine removed branch:9.2 branch:9.1 branch:8.19 labels Nov 14, 2025

Update docs/changelog/138115.yaml

48fde3a

Merge branch 'main' into bug-137005

4ea451a

alexey-ivanov-es requested a review from a team November 14, 2025 17:45

elasticsearchmachine and others added 2 commits November 14, 2025 17:51

[CI] Auto commit changes from spotless

ca2fec1

Fix potential NPE

004395a

mosche reviewed Nov 17, 2025

View reviewed changes

...cation/src/main/java/org/elasticsearch/xpack/deprecation/TransportDeprecationInfoAction.java Show resolved Hide resolved

mosche reviewed Nov 18, 2025

View reviewed changes

Merge branch 'main' into bug-137005

106039c

elasticsearchmachine added v8.19.9 v9.1.9 and removed v8.19.8 v9.1.8 labels Nov 27, 2025

alexey-ivanov-es merged commit 28992e6 into elastic:main Dec 1, 2025
33 of 35 checks passed

alexey-ivanov-es mentioned this pull request Dec 1, 2025

[9.2] GET /_migration/deprecations doesn't check disk watermarks against correct settings values (#138115) #138818

Merged

elasticsearchmachine added the backport pending label Dec 1, 2025

alexey-ivanov-es deleted the bug-137005 branch December 1, 2025 14:06

alexey-ivanov-es added a commit to alexey-ivanov-es/elasticsearch that referenced this pull request Dec 1, 2025

[9.1] GET /_migration/deprecations doesn't check disk watermarks agai…

f618b00

…nst correct settings values (elastic#138115)

alexey-ivanov-es mentioned this pull request Dec 1, 2025

[9.1] GET /_migration/deprecations doesn't check disk watermarks against correct settings values (#138115) #138837

Merged

alexey-ivanov-es added a commit to alexey-ivanov-es/elasticsearch that referenced this pull request Dec 1, 2025

[8.19] GET /_migration/deprecations doesn't check disk watermarks aga…

4c9f345

…inst correct settings values (elastic#138115)

alexey-ivanov-es mentioned this pull request Dec 1, 2025

[8.19] GET /_migration/deprecations doesn't check disk watermarks against correct settings values (#138115) #138840

Merged

elasticsearchmachine pushed a commit that referenced this pull request Dec 1, 2025

[9.1] GET /_migration/deprecations doesn't check disk watermarks agai…

30e5861

…nst correct settings values (#138115) (#138837)

alexey-ivanov-es removed the backport pending label Dec 1, 2025

alexey-ivanov-es mentioned this pull request Dec 1, 2025

Fix for GET /_migration/deprecations doesn't report node deprecations if low watermark exceeded and GET /_migration/deprecations doesn't report node-level failures properly #137964

Merged

mamazzol mentioned this pull request Jan 2, 2026

Skip frozen nodes for disk usage check #140118

Merged

mamazzol added a commit that referenced this pull request Jan 2, 2026

Skip frozen nodes on disk watermark check(#140118) Solves bug introdu…

e0375e5

…ced in #138115 Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115

elasticsearchmachine pushed a commit that referenced this pull request Jan 2, 2026

Skip frozen nodes on disk watermark check(#140118) Solves bug introdu…

fc8ce5f

…ced in #138115 (#140121) Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115

elasticsearchmachine pushed a commit that referenced this pull request Jan 6, 2026

Skip frozen nodes on disk watermark check(#140118) Solves bug introdu…

c2ab288

…ced in #138115 (#140123) Skip frozen nodes on disk watermark check(#140118) Solves bug introduced in #138115

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

GET /_migration/deprecations doesn't check disk watermarks against correct settings values #138115

GET /_migration/deprecations doesn't check disk watermarks against correct settings values #138115

Uh oh!

alexey-ivanov-es commented Nov 14, 2025 •

edited

Loading

Uh oh!

elasticsearchmachine commented Nov 14, 2025

Uh oh!

elasticsearchmachine commented Nov 14, 2025

Uh oh!

Uh oh!

mosche commented Nov 17, 2025

Uh oh!

mosche left a comment

Uh oh!

Uh oh!

Uh oh!

mosche Nov 17, 2025

Uh oh!

mosche Nov 18, 2025

Uh oh!

alexey-ivanov-es Nov 28, 2025

Uh oh!

Uh oh!

elasticsearchmachine commented Dec 1, 2025

Uh oh!

alexey-ivanov-es commented Dec 1, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

GET /_migration/deprecations doesn't check disk watermarks against correct settings values #138115

GET /_migration/deprecations doesn't check disk watermarks against correct settings values #138115

Uh oh!

Conversation

alexey-ivanov-es commented Nov 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elasticsearchmachine commented Nov 14, 2025

Uh oh!

elasticsearchmachine commented Nov 14, 2025

Uh oh!

Uh oh!

mosche commented Nov 17, 2025

Uh oh!

mosche left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

mosche Nov 17, 2025

Choose a reason for hiding this comment

Uh oh!

mosche Nov 18, 2025

Choose a reason for hiding this comment

Uh oh!

alexey-ivanov-es Nov 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

elasticsearchmachine commented Dec 1, 2025

💔 Backport failed

Uh oh!

alexey-ivanov-es commented Dec 1, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

alexey-ivanov-es commented Nov 14, 2025 •

edited

Loading