Skip to content

Make TransportRemoveIndexLifecyclePolicyAction project-aware #129364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2025
Merged

Make TransportRemoveIndexLifecyclePolicyAction project-aware #129364

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aff1f4
Make `TransportRemoveIndexLifecyclePolicyAction` project-aware
nielsbauman Jun 11, 2025
2e97e5e
Merge branch 'main' into ilm-remove-mp
nielsbauman Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ...in/java/org/elasticsearch/xpack/ilm/action/TransportRemoveIndexLifecyclePolicyAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.project.ProjectResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.util.concurrent.EsExecutors;
import org.elasticsearch.core.SuppressForbidden;
Expand All @@ -33,6 +34,7 @@

public class TransportRemoveIndexLifecyclePolicyAction extends TransportMasterNodeAction<Request, Response> {

private final ProjectResolver projectResolver;
private final IndexNameExpressionResolver indexNameExpressionResolver;

@Inject
Expand All @@ -41,6 +43,7 @@ public TransportRemoveIndexLifecyclePolicyAction(
ClusterService clusterService,
ThreadPool threadPool,
ActionFilters actionFilters,
ProjectResolver projectResolver,
IndexNameExpressionResolver indexNameExpressionResolver
) {
super(
Expand All @@ -54,6 +57,7 @@ public TransportRemoveIndexLifecyclePolicyAction(
EsExecutors.DIRECT_EXECUTOR_SERVICE
);
this.indexNameExpressionResolver = indexNameExpressionResolver;
this.projectResolver = projectResolver;
}

@Override
Expand All @@ -63,15 +67,16 @@ protected ClusterBlockException checkBlock(Request request, ClusterState state)

@Override
protected void masterOperation(Task task, Request request, ClusterState state, ActionListener<Response> listener) throws Exception {
final Index[] indices = indexNameExpressionResolver.concreteIndices(state, request.indicesOptions(), true, request.indices());
final var project = projectResolver.getProjectMetadata(state);
final Index[] indices = indexNameExpressionResolver.concreteIndices(project, request.indicesOptions(), true, request.indices());
submitUnbatchedTask("remove-lifecycle-for-index", new ClusterStateUpdateTask(request.masterNodeTimeout()) {

private final List<String> failedIndexes = new ArrayList<>();

@Override
public ClusterState execute(ClusterState currentState) throws Exception {
final var project = currentState.metadata().getProject();
final var updatedProject = IndexLifecycleTransition.removePolicyForIndexes(indices, project, failedIndexes);
final var currentProjet = currentState.metadata().getProject(project.id());
final var updatedProject = IndexLifecycleTransition.removePolicyForIndexes(indices, currentProjet, failedIndexes);
return ClusterState.builder(currentState).putProjectMetadata(updatedProject).build();
}

Expand Down