Avoid needless index metadata builders during reroute #88506
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
original-brownbear
added
>non-issue
:Distributed Coordination/Allocation
…ex-metadata-building
| @@ -64,13 +58,25 @@ public static <K, V> Map<K, V> copyMapWithAddedEntry(final Map<K, V> map, final | |||
| * @param <V> the type of the values in the map | |||
| * @return an immutable map that contains the items from the specified map and a mapping from the specified key to the specified value | |||
| */ | |||
| @SuppressWarnings("unchecked") | |||
| public static <K, V> Map<K, V> copyMapWithAddedOrReplacedEntry(final Map<K, V> map, final K key, final V value) { | |||
There was a problem hiding this comment.
Changes here aren't 100% necessary for this to work, but they cause the whole thing to compile far better.
Without this change there's not really any reason to improve this code though so I put it in here.
| @@ -41,9 +38,6 @@ public class Maps { | |||
| */ | |||
| @SuppressWarnings("unchecked") | |||
| public static <K, V> Map<K, V> copyMapWithAddedEntry(final Map<K, V> map, final K key, final V value) { | |||
| Objects.requireNonNull(map); | |||
There was a problem hiding this comment.
No need for these checks, they're all pointless since a null for any of the three parameters will throw an NPE below anyway.
There was a problem hiding this comment.
May be keep them ass assert so that it is clear for the reader?
There was a problem hiding this comment.
++ Sure thing added :)
| @@ -654,7 +655,8 @@ private IndexMetadata( | |||
| this.autoExpandReplicas = autoExpandReplicas; | |||
| this.isSearchableSnapshot = isSearchableSnapshot; | |||
| this.isPartialSearchableSnapshot = isPartialSearchableSnapshot; | |||
| this.indexCompatibilityVersion = SETTING_INDEX_VERSION_COMPATIBILITY.get(settings); | |||
| this.indexCompatibilityVersion = indexCompatibilityVersion; | |||
| assert indexCompatibilityVersion.equals(SETTING_INDEX_VERSION_COMPATIBILITY.get(settings)); | |||
There was a problem hiding this comment.
This snuck in recently making the constructor here needlessly heavy, fixed here so the copy-constructors are as fast as possible again.
elasticmachine
added
the
Team:Distributed (Obsolete)
|
Pinging @elastic/es-distributed (Team:Distributed) |
idegtiarenko
approved these changes
Jul 14, 2022
|
Thanks Ievgen! |
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Jul 15, 2022
* upstream/master: (2974 commits) Reserved cluster state service (elastic#88527) Add transport action immutable state checks (elastic#88491) Remove suggest flag from index stats docs (elastic#85479) Polling cluster formation state for master-is-stable health indicator (elastic#88397) Add test execution guide in yamlRestTest asciidoc (elastic#88490) Add troubleshooting guide for corrupt repository (elastic#88391) [Transform] Finetune Schedule to be less noisy on retry and retry slower (elastic#88531) Updatable API keys - auto-update legacy RDs (elastic#88514) Fix typo in TransportForceMergeAction and TransportClearIndicesCacheA… (elastic#88064) Fixed NullPointerException on bulk request (elastic#88358) Avoid needless index metadata builders during reroute (elastic#88506) Set metadata on request in API key noop test (elastic#88507) Fix passing positional args to ES in Docker (elastic#88502) Improve description for task api detailed param (elastic#88493) Support cartesian shape with doc values (elastic#88487) Promote usage of Subjects in Authentication class (elastic#88494) Add CCx 2.0 feature flag (elastic#88451) Reword the watcher 'always' and 'never' condition docs (elastic#86105) Simplify azure discovery installation docs (elastic#88404) Breakup FIPS CI testing jobs ... # Conflicts: # server/src/main/java/org/elasticsearch/index/mapper/NumberFieldMapper.java # x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/mapper/AggregateDoubleMetricFieldMapper.java
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 set of changes makes
org.elasticsearch.cluster.routing.allocation.IndexMetadataUpdater#applyChangesessentially free even in clusters of O(100k) indices compared to using a disproportionately increasing amount of CPU as the cluster grows (about 1% of CPU time while bootstrapping many shards at 25k indices benchmarks and increasing from there).It also appears to have additional benefits end-to-end in those benchmarks, likely as a result of making diffing metadata cheaper by retaining more instance equality across the board.
relates #77466