Fix single project GetClusterState API response for multiproject #133936
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
… API for single project MP clusters
alexey-ivanov-es
added
:Core/Infra/Core
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
alexey-ivanov-es
commented
Sep 1, 2025
| @@ -39,6 +39,7 @@ public class ClusterStateRequest extends LocalClusterStateRequest implements Ind | |||
| private TimeValue waitForTimeout = DEFAULT_WAIT_FOR_NODE_TIMEOUT; | |||
| private String[] indices = Strings.EMPTY_ARRAY; | |||
| private IndicesOptions indicesOptions = IndicesOptions.lenientExpandOpen(); | |||
| private boolean multiproject = false; | |||
There was a problem hiding this comment.
ClusterStateRequest is LocalClusterStateRequest, so doesn't require a new transport version
…er state is expected
elasticsearchmachine
added
the
serverless-linked
alexey-ivanov-es
commented
Sep 4, 2025
test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
Show resolved
Hide resolved
ywangd
reviewed
Sep 5, 2025
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
test/framework/src/main/java/org/elasticsearch/test/InternalTestCluster.java
Show resolved
Hide resolved
Comment on lines
114
to
+115
| params = Map.of(Metadata.CONTEXT_MODE_PARAM, Metadata.CONTEXT_MODE_API, "multi-project", "true"); | ||
| clusterStateRequest.multiproject(true); |
There was a problem hiding this comment.
Now we have the new field, it feels an opportunity to remove the use of XContent parameter here as suggest by the above @FixForMultiProject annotation. It does not need to be this PR.
ywangd
reviewed
Sep 8, 2025
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
ywangd
approved these changes
Sep 9, 2025
.../src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java
Outdated
Show resolved
Hide resolved
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.
As it was noted in #132332 (comment) we have a general principle that API output for a single project should be the same regardless of whether the cluster is non-MP or MP. (However, the reserved metadata merge logic was never properly implemented to support this)
As a result of changes in that PR, response formats diverged. This PR makes the single project GetClusterState API response for MP clusters match the non-MP format