Skip to content

Remove deprecated usages in TransportPutFollowAction #132038

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 1 commit into from
Jul 29, 2025
Merged

Remove deprecated usages in TransportPutFollowAction #132038

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions ...plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportPutFollowAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.metadata.ProjectId;
import org.elasticsearch.cluster.metadata.ProjectMetadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.IndexScopedSettings;
Expand Down Expand Up @@ -207,6 +208,10 @@ private void createFollowerIndex(
(delegatedListener, response) -> afterRestoreStarted(clientWithHeaders, request, delegatedListener, response)
);

@FixForMultiProject(
description = "CCR may not be in scope for multi-project though we haven't made the decision explicitly yet. See also ES-12139"
)
final ProjectId projectId = ProjectId.DEFAULT;
final BiConsumer<ClusterState, Metadata.Builder> updater;
if (remoteDataStream == null) {
// If the index we're following is not part of a data stream, start the
Expand All @@ -229,8 +234,9 @@ private void createFollowerIndex(
// There was no specified name, use the original data stream name.
localDataStreamName = remoteDataStream.getName();
}
final DataStream localDataStream = mdBuilder.dataStreamMetadata().dataStreams().get(localDataStreamName);
final Index followerIndex = mdBuilder.get(followerIndexName).getIndex();
final ProjectMetadata.Builder projectBuilder = mdBuilder.getProject(projectId);
final DataStream localDataStream = projectBuilder.dataStream(localDataStreamName);
final Index followerIndex = projectBuilder.get(followerIndexName).getIndex();
assert followerIndex != null : "expected followerIndex " + followerIndexName + " to exist in the state, but it did not";

final DataStream updatedDataStream = updateLocalDataStream(
Expand All @@ -239,13 +245,9 @@ private void createFollowerIndex(
localDataStreamName,
remoteDataStream
);
mdBuilder.put(updatedDataStream);
projectBuilder.put(updatedDataStream);
};
}
@FixForMultiProject(
description = "CCR may not be in scope for multi-project though we haven't made the decision explicitly yet. See also ES-12139"
)
final ProjectId projectId = ProjectId.DEFAULT;
threadPool.executor(ThreadPool.Names.SNAPSHOT_META)
.execute(ActionRunnable.wrap(delegatelistener, l -> restoreService.restoreSnapshot(projectId, restoreRequest, l, updater)));
}
Expand Down