Merge branch 'main' into sorting_on_range_fields_throws_400_doc

drempapis · web-flow · commit 99b3322807d3 · 2025-06-30T15:26:16.000+03:00
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
@@ -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();
             }

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ protected void masterOperation(`
`80`	`80`	`submitUnbatchedTask("ilm-re-run", new AckedClusterStateUpdateTask(request, listener) {`
`81`	`81`	`@Override`
`82`	`82`	`public ClusterState execute(ClusterState currentState) {`
`83`		`- final var project = state.metadata().getProject(projectState.projectId());`
	`83`	`+ final var project = currentState.metadata().getProject(projectState.projectId());`
`84`	`84`	`final var updatedProject = indexLifecycleService.moveIndicesToPreviouslyFailedStep(project, request.indices());`
`85`	`85`	`return ClusterState.builder(currentState).putProjectMetadata(updatedProject).build();`
`86`	`86`	`}`