Speed up DataTierAllocationDecider#78075
Merged
original-brownbear merged 9 commits intoelastic:masterfrom Sep 22, 2021
original-brownbear:speed-up-data-tier-allocation-decider
Merged
Speed up DataTierAllocationDecider#78075original-brownbear merged 9 commits intoelastic:masterfrom original-brownbear:speed-up-data-tier-allocation-decider
original-brownbear merged 9 commits intoelastic:masterfrom
original-brownbear:speed-up-data-tier-allocation-decider
Conversation
This decider is quite slow in `allocationAllowed` and shows up in profiling. We should be able to get a much tighter loop with this change that avoids building the list of role names over and over and removes some dead code as well.
Collaborator
|
Pinging @elastic/es-data-management (Team:Data Management) |
Contributor
|
Do you happen to know how good are the tests here? I added an exception into |
dakrone
requested changes
Sep 21, 2021
Member
dakrone
left a comment
There was a problem hiding this comment.
I left a couple of comments, I think we can simplify this more
.../main/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java
Outdated
Show resolved
Hide resolved
.../main/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java
Outdated
Show resolved
Hide resolved
The tierName argument is a single tier name, rather than comma separated list of zero or more tier names.
Contributor
|
Great catch, @dakrone, I've added two commits that should address your comments. |
dakrone
approved these changes
Sep 22, 2021
Member
dakrone
left a comment
There was a problem hiding this comment.
LGTM, I left two really minor comments
|
|
||
| public static String[] parseTierList(String tiers) { | ||
| return Strings.tokenizeToStringArray(tiers, ","); | ||
| if (Strings.hasLength(tiers) == false) { |
Member
There was a problem hiding this comment.
To avoid an array like [" "] (not that we expect that), maybe we should use:
Suggested change
| if (Strings.hasLength(tiers) == false) { | |
| if (Strings.hasText(tiers) == false) { |
| String[] values = parseTierList(tierSetting); | ||
| for (String value : values) { | ||
| private static boolean allocationAllowed(String tierName, Set<DiscoveryNodeRole> roles) { | ||
| assert Strings.hasLength(tierName) : "tierName must be not null and non-empty, but was [" + tierName + "]"; |
Member
There was a problem hiding this comment.
Same here,
Suggested change
| assert Strings.hasLength(tierName) : "tierName must be not null and non-empty, but was [" + tierName + "]"; | |
| assert Strings.hasText(tierName) : "tierName must be not null and non-empty, but was [" + tierName + "]"; |
…-allocation-decider
Contributor
Author
|
Jenkins run elasticsearch-ci/part-2 |
Contributor
Author
|
Thanks Joe + Lee! |
original-brownbear
added a commit
that referenced
this pull request
Sep 22, 2021
This decider is quite slow in `allocationAllowed` and shows up in profiling. We should be able to get a much tighter loop with this change that avoids building the list of role names over and over and removes some dead code as well. Co-authored-by: Joe Gallo <joegallo@gmail.com>
97 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 decider is quite slow in
allocationAllowedand shows up in profiling.We should be able to get a much tighter loop with this change that avoids building
the list of role names over and over and removes some dead code as well.
There's certainly additional speedups possible here though, this just deals with the most obvious issue.