Migrate the reserved repository action to be per-project #130155
Merged
Conversation
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
Resolves: ES-10479
ywangd
added
>non-issue
:Distributed Coordination/Snapshot/Restore
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
elasticsearchmachine
added
the
Team:Distributed Coordination
ywangd
commented
Jun 27, 2025
Comment on lines
+89
to
+99
| @Override | ||
| protected void validateForReservedState(DeleteRepositoryRequest request, ClusterState state) { | ||
| super.validateForReservedState(request, state); | ||
|
|
||
| validateForReservedState( | ||
| projectResolver.getProjectMetadata(state).reservedStateMetadata().values(), | ||
| reservedStateHandlerName().get(), | ||
| modifiedKeys(request), | ||
| request.toString() | ||
| ); | ||
| } |
elasticsearchmachine
added
the
serverless-linked
pxsalehi
reviewed
Jun 30, 2025
| @@ -36,7 +35,7 @@ | |||
| * It is used by the ReservedClusterStateService to add/update or remove snapshot repositories. Typical usage | |||
| * for this action is in the context of file based settings. | |||
| */ | |||
| public class ReservedRepositoryAction implements ReservedClusterStateHandler<List<PutRepositoryRequest>> { | |||
| public class ReservedRepositoryAction implements ReservedProjectStateHandler<List<PutRepositoryRequest>> { | |||
There was a problem hiding this comment.
Basic question. In a non-MP stateless cluster, this is still sufficient because now the cluster back up repo falls under the "default" project?
There was a problem hiding this comment.
Yes. Additionally, we have ProjectClusterStateHandlerAdapter which reads the reserved state from the main settings.json file in a non-MP setup.
There was a problem hiding this comment.
This is correct, no need to explicitly handle the non-MP case.
pxsalehi
approved these changes
Jul 1, 2025
|
@elasticmachine update branch |
ywangd
added
the
auto-merge-without-approval
mark-vieira
approved these changes
Jul 1, 2025
| @@ -36,7 +35,7 @@ | |||
| * It is used by the ReservedClusterStateService to add/update or remove snapshot repositories. Typical usage | |||
| * for this action is in the context of file based settings. | |||
| */ | |||
| public class ReservedRepositoryAction implements ReservedClusterStateHandler<List<PutRepositoryRequest>> { | |||
| public class ReservedRepositoryAction implements ReservedProjectStateHandler<List<PutRepositoryRequest>> { | |||
There was a problem hiding this comment.
This is correct, no need to explicitly handle the non-MP case.
|
@elasticmachine update branch |
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Resolves: ES-10479