Remove nesting from multi allocation decision #130844
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
mhl-b
added
>non-issue
:Distributed Coordination/Allocation
Collaborator
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
mhl-b
commented
Jul 8, 2025
| } | ||
|
|
||
| final Decision decision = new Decision.Multi().add(allocationDecision).add(rebalanceDecision); | ||
| final Decision.Type canAllocateOrRebalance = Decision.Type.min(allocationDecision.type(), rebalanceDecision.type()); |
Contributor
Author
There was a problem hiding this comment.
this place could create nested multi decision
DiannaHohensee
approved these changes
Jul 11, 2025
| return true; | ||
| } | ||
| return false; | ||
| } else return other == THROTTLE && this == YES; |
Contributor
There was a problem hiding this comment.
slight nit that this isn't our usual style for if-else statements, skipping the {} brackets.
Contributor
Author
There was a problem hiding this comment.
hm intellij auto-format did that and spotless didn't complain either.
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object object) { |
Contributor
There was a problem hiding this comment.
Did you remove this because equality is unused?
Contributor
Author
There was a problem hiding this comment.
records implement hash/equals/toString https://docs.oracle.com/en/java/javase/17/language/records.html
Contributor
Author
There was a problem hiding this comment.
I keep toString for bwc. If exact format is not important can remove it too.
Contributor
There was a problem hiding this comment.
I think a change might affect the allocation explain response? I'd leave it for bwc, as you say.
szybia
added a commit
to szybia/elasticsearch
that referenced
this pull request
Jul 14, 2025
…king * upstream/main: (33 commits) Allow both WithEntitlementsOnTestCode and EntitledTestPackages together (elastic#130826) Move streams status actions to cluster:monitor group (elastic#131015) Update JDK base image for OIDC fixture (elastic#131176) Mute org.elasticsearch.xpack.esql.ccq.MultiClustersIT testLookupJoinAliases elastic#131166 Mute org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests testEnqueuedMergeTasksAreUnblockedWhenEstimatedMergeSizeChanges elastic#131165 Mute org.elasticsearch.xpack.esql.ccq.MultiClustersIT testNotLikeListKeyword elastic#131155 Mute org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT test elastic#131154 Check file entitlements on the Lucene FilterFileSystem in tests (elastic#130825) Mute org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT test {lookup-join.MvJoinKeyOnFromAfterStats ASYNC} elastic#131148 Move FrequencyCappedAction to common package (elastic#131060) Mute org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT testStopQueryLocal elastic#121672 Remove nesting from multi allocation decision (elastic#130844) Disable async search rest tests in release builds (elastic#131132) Fix testStopQueryLocal (elastic#131130) Fixes based on resharding disruption tests (elastic#130870) Remove inactive logger (elastic#131121) Add wait for remote start for the test (elastic#131124) Add existing shards allocator settings to failure store allowed list. (elastic#131056) Don't allow field caps to use semantic queries as index filters (elastic#131111) issue should be already fixed by elastic#121466 (elastic#130860) ...
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 17, 2025
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 17, 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.
Refactor
org.elasticsearch.cluster.routing.allocation.decider.Decision. Change to sealed interface and use records for Single and Multi. Also remove recursive Multi decision support.