Make restore support multi-project #131661
Open
+315
−175
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
ywangd
added
>non-issue
:Distributed Coordination/Snapshot/Restore
elasticsearchmachine
added
the
Team:Distributed Coordination
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
elasticsearchmachine
added
the
serverless-linked
|
I will be updating tests like |
ywangd
commented
Jul 22, 2025
Comment on lines
-380
to
+384
| params -> Iterators.concat(Iterators.single((builder, ignored) -> builder.field("id", projectMetadata.id()))) | ||
| params -> Iterators.concat( | ||
| Iterators.single((ToXContent) (builder, p) -> builder.field("id", projectMetadata.id())), | ||
| projectMetadata.toXContentChunked(params) | ||
| ) |
There was a problem hiding this comment.
Fixing a silly bug from #130000 ...
pxsalehi
reviewed
Jul 23, 2025
| if (metadata.persistentSettings() != null) { | ||
| assert deserializeProjectMetadata == false || metadata.persistentSettings().isEmpty() |
There was a problem hiding this comment.
should this be (deserializeProjectMetadata == false && projectId.equals(DEFAULT))?
There was a problem hiding this comment.
also I assume we're not restoring settings from the metadata for the project since they're not in metadata?
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.
This PR makes the restore process project aware and unmute relevant tests. The later requires TransportRecoveryAction to be project aware which is done in this PR as well.
Relates: #130000