Do not pass ThreadPool to DesiredBalanceComputer #116590
Merged
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
pxsalehi
added
>non-issue
:Distributed Coordination/Allocation
elasticsearchmachine
added
Team:Distributed Coordination
|
Pinging @elastic/es-distributed-coordination (Team:Distributed Coordination) |
| } | ||
|
|
||
| DesiredBalanceComputer(ClusterSettings clusterSettings, ShardsAllocator delegateAllocator, LongSupplier timeSupplierMillis) { | ||
| public DesiredBalanceComputer(ClusterSettings clusterSettings, LongSupplier timeSupplierMillis, ShardsAllocator delegateAllocator) { |
There was a problem hiding this comment.
Nit: lets keep the original order of arguments (clusterSettings, delegateAllocator, timeSupplierMillis), this could allow to minimize some of the changes such as:
new DesiredBalanceComputer(clusterSettings, shardsAllocator, time::get) {
new DesiredBalanceComputer(clusterSettings, time::get, shardsAllocator) {
There was a problem hiding this comment.
This IS the original order (i.e. the existing public constructor), just replaced the threadpool with time supplier. :)
| @@ -1349,7 +1353,7 @@ public ShardAllocationDecision decideShardAllocation(ShardRouting shard, Routing | |||
| } | |||
|
|
|||
| private static DesiredBalanceComputer createDesiredBalanceComputer(ShardsAllocator allocator) { | |||
| return new DesiredBalanceComputer(createBuiltInClusterSettings(), mock(ThreadPool.class), allocator); | |||
| return new DesiredBalanceComputer(createBuiltInClusterSettings(), mock(ThreadPool.class)::relativeTimeInMillis, allocator); | |||
There was a problem hiding this comment.
It looks like we no longer need mock here
Suggested change
| return new DesiredBalanceComputer(createBuiltInClusterSettings(), mock(ThreadPool.class)::relativeTimeInMillis, allocator); | |
| return new DesiredBalanceComputer(createBuiltInClusterSettings(), () -> 0L, allocator); |
| unassignedIterator.removeAndIgnore(UnassignedInfo.AllocationStatus.NO_ATTEMPT, allocation.changes()); | ||
| var desiredBalanceComputer = new DesiredBalanceComputer( | ||
| clusterSettings, | ||
| mockThreadPool::relativeTimeInMillis, |
There was a problem hiding this comment.
It looks like this mockThreadPool could be simplified as well
Suggested change
| mockThreadPool::relativeTimeInMillis, | |
| () -> currentTime.addAndGet(eachIterationDuration), |
this way it might not be created at all above.
There was a problem hiding this comment.
oh, right. didn't see that. thanks.
idegtiarenko
approved these changes
Nov 11, 2024
pxsalehi
added
the
auto-merge-without-approval
pxsalehi
deleted the
ps241111-removeThreadPoolFromDesiredBalanceComputer
branch
jozala
pushed a commit
that referenced
this pull request
Nov 13, 2024
Relates #115511 (comment). `ThreadPool` is used here only to get time. (I've extracted this out of #116333).
afoucret
pushed a commit
to afoucret/elasticsearch
that referenced
this pull request
Nov 14, 2024
Relates elastic#115511 (comment). `ThreadPool` is used here only to get time. (I've extracted this out of elastic#116333).
alexey-ivanov-es
pushed a commit
to alexey-ivanov-es/elasticsearch
that referenced
this pull request
Nov 28, 2024
Relates elastic#115511 (comment). `ThreadPool` is used here only to get time. (I've extracted this out of elastic#116333).
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.
Relates #115511 (comment).
ThreadPoolis used here only to get time. (I've extracted this out of #116333).