-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Extract UpdateSnapshotStatusAction to its own file #132522
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.
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
DiannaHohensee
merged 10 commits into
elastic:main
from
DiannaHohensee:2025/08/06/snapshot-service-transport-action-refactor
Aug 7, 2025
Merged
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
2fb836f
Extract UpdateSnapshotStatusAction to its own file
DiannaHohensee 9321ad8
remove assert
DiannaHohensee 1ffdc89
make constructor public, doh
DiannaHohensee 9bac630
Merge branch 'main' into 2025/08/06/snapshot-service-transport-action…
DiannaHohensee f47f725
remove no longer used variables
DiannaHohensee 46bb887
add transport action explicitly to test; improve assert error message
DiannaHohensee 19381e0
Merge branch 'main' into 2025/08/06/snapshot-service-transport-action…
DiannaHohensee 0bde320
add action to non-operator-actions list for testing
DiannaHohensee 69a34b7
Merge branch 'main' into 2025/08/06/snapshot-service-transport-action…
DiannaHohensee 901fd11
Merge branch 'main' into 2025/08/06/snapshot-service-transport-action…
DiannaHohensee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
server/src/main/java/org/elasticsearch/snapshots/TransportUpdateSnapshotStatusAction.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.snapshots; | ||
|
|
||
| import org.elasticsearch.action.ActionListener; | ||
| import org.elasticsearch.action.ActionResponse; | ||
| import org.elasticsearch.action.ActionType; | ||
| import org.elasticsearch.action.support.ActionFilters; | ||
| import org.elasticsearch.action.support.master.TransportMasterNodeAction; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.cluster.block.ClusterBlockException; | ||
| import org.elasticsearch.cluster.service.ClusterService; | ||
| import org.elasticsearch.common.util.concurrent.EsExecutors; | ||
| import org.elasticsearch.injection.guice.Inject; | ||
| import org.elasticsearch.tasks.Task; | ||
| import org.elasticsearch.threadpool.ThreadPool; | ||
| import org.elasticsearch.transport.TransportService; | ||
|
|
||
| public final class TransportUpdateSnapshotStatusAction extends TransportMasterNodeAction< | ||
| UpdateIndexShardSnapshotStatusRequest, | ||
| ActionResponse.Empty> { | ||
| public static final String NAME = "internal:cluster/snapshot/update_snapshot_status"; | ||
| public static final ActionType<ActionResponse.Empty> TYPE = new ActionType<>(NAME); | ||
|
|
||
| private final SnapshotsService snapshotsService; | ||
|
|
||
| @Inject | ||
| public TransportUpdateSnapshotStatusAction( | ||
| TransportService transportService, | ||
| ClusterService clusterService, | ||
| ThreadPool threadPool, | ||
| SnapshotsService snapshotsService, | ||
| ActionFilters actionFilters | ||
| ) { | ||
| super( | ||
| NAME, | ||
| false, | ||
| transportService, | ||
| clusterService, | ||
| threadPool, | ||
| actionFilters, | ||
| UpdateIndexShardSnapshotStatusRequest::new, | ||
| in -> ActionResponse.Empty.INSTANCE, | ||
| EsExecutors.DIRECT_EXECUTOR_SERVICE | ||
| ); | ||
| this.snapshotsService = snapshotsService; | ||
| } | ||
|
|
||
| @Override | ||
| protected void masterOperation( | ||
| Task task, | ||
| UpdateIndexShardSnapshotStatusRequest request, | ||
| ClusterState state, | ||
| ActionListener<ActionResponse.Empty> listener | ||
| ) { | ||
| snapshotsService.createAndSubmitRequestToUpdateSnapshotState( | ||
| request.snapshot(), | ||
| request.shardId(), | ||
| null, | ||
| request.status(), | ||
| listener.map(v -> ActionResponse.Empty.INSTANCE) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| protected ClusterBlockException checkBlock(UpdateIndexShardSnapshotStatusRequest request, ClusterState state) { | ||
| return null; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is no need to register this action here since it is never invoked by
Client. We will not need modify the operator privilegeConstantsif we don't register the action here.