Allow passing several reserved state chunks in single process call #124574
+258
−4
Conversation
This file contains 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
elasticsearchmachine
added
the
serverless-linked
jfreden
changed the title
jfreden
force-pushed
the
change_mp_file_processing
branch
from
2d34177 to
4095a58
Compare
jfreden
changed the title
jfreden
commented
Mar 12, 2025
| @@ -187,7 +188,7 @@ public void process( | |||
| process(namespace, stateChunk, versionCheck, errorListener); | |||
| } | |||
|
|
|||
| ReservedStateChunk parse(ProjectId projectId, String namespace, XContentParser parser) { | |||
| public ReservedStateChunk parse(ProjectId projectId, String namespace, XContentParser parser) { | |||
There was a problem hiding this comment.
This can be used by a caller to parse several state chunks before passing them to process.
jfreden
commented
Mar 12, 2025
| @@ -518,6 +572,11 @@ void updateErrorState(ErrorState errorState) { | |||
| return; | |||
| } | |||
|
|
|||
| if (errorState.projectId().isPresent() && clusterService.state().metadata().hasProject(errorState.projectId().get()) == false) { | |||
There was a problem hiding this comment.
This was a bug. If parsing fails for a project that doesn't exist yet, the error state reporting won't work since it's persisted in the project metadata that doesn't exist yet. This case needs to be handled in the caller (multi-project file service).
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
|
Hi @jfreden, I've created a changelog YAML for you. |
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 overloads the
processmethod and allows it to be used with severalReservedStateChunks. The purpose is to allow several state chunks to be spread across several files but handled as a single cluster state update by validating and merging them into a single representation of theReservedStateChunk.