From 009dbb46e5e01a147840fc71738e07238615dfab Mon Sep 17 00:00:00 2001 From: Niels Bauman Date: Fri, 27 Jun 2025 16:27:57 -0300 Subject: [PATCH 1/3] Fix typo in ILM retry action A change in #128930 introduced a typo which could result in erroneous cluster state updates. --- .../elasticsearch/xpack/ilm/action/TransportRetryAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java index 5c3200c873877..2583a80a3cfb6 100644 --- a/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java +++ b/x-pack/plugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/action/TransportRetryAction.java @@ -80,7 +80,7 @@ protected void masterOperation( submitUnbatchedTask("ilm-re-run", new AckedClusterStateUpdateTask(request, listener) { @Override public ClusterState execute(ClusterState currentState) { - final var project = state.metadata().getProject(projectState.projectId()); + final var project = currentState.metadata().getProject(projectState.projectId()); final var updatedProject = indexLifecycleService.moveIndicesToPreviouslyFailedStep(project, request.indices()); return ClusterState.builder(currentState).putProjectMetadata(updatedProject).build(); } From be60ddfc5e0e9f9aa215e2bdf88aee52c86e5088 Mon Sep 17 00:00:00 2001 From: Niels Bauman <33722607+nielsbauman@users.noreply.github.com> Date: Fri, 27 Jun 2025 16:29:34 -0300 Subject: [PATCH 2/3] Update docs/changelog/130255.yaml --- docs/changelog/130255.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/130255.yaml diff --git a/docs/changelog/130255.yaml b/docs/changelog/130255.yaml new file mode 100644 index 0000000000000..45abf48ca0d83 --- /dev/null +++ b/docs/changelog/130255.yaml @@ -0,0 +1,5 @@ +pr: 130255 +summary: Fix typo in ILM retry action +area: ILM+SLM +type: bug +issues: [] From 39d4aa8f82b86ff272970eb5e3f3ef45a73d9526 Mon Sep 17 00:00:00 2001 From: Niels Bauman <33722607+nielsbauman@users.noreply.github.com> Date: Fri, 27 Jun 2025 16:30:12 -0300 Subject: [PATCH 3/3] Delete docs/changelog/130255.yaml --- docs/changelog/130255.yaml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 docs/changelog/130255.yaml diff --git a/docs/changelog/130255.yaml b/docs/changelog/130255.yaml deleted file mode 100644 index 45abf48ca0d83..0000000000000 --- a/docs/changelog/130255.yaml +++ /dev/null @@ -1,5 +0,0 @@ -pr: 130255 -summary: Fix typo in ILM retry action -area: ILM+SLM -type: bug -issues: []