Backport ShardRecoveryHandlerrefactorings to 1.x
#8570
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
| mappingUpdatedAction.updateMappingOnMaster(indexService.index().getName(), documentMapper, indexService.indexUUID(), listener); | ||
| } | ||
| try { | ||
| if (!updatedOnMaster.await(internalActionTimeout.millis(), TimeUnit.MILLISECONDS)) { |
There was a problem hiding this comment.
Should this await be cancelable?
There was a problem hiding this comment.
it should I will fix seperately in master and backport then ok?
|
Left one question, other than that LGTM |
Previously the bulk of our shard recovery code was in a 300-line anonymous class in `RecoverySource`. This made it difficult to find and more difficult to read. This factors out that code into a `ShardRecoveryHandler` class, adding javadocs for each function and phase of the recovery, as well as comments explaining some of the more esoteric functions performed during recovery. It's hoped that this will help more people understand Elasticsearch's recovery procedure. No *major* functionality has changed, only typo corrections, some minor allocation improvements and logging clarification changes. Conflicts: src/main/java/org/elasticsearch/indices/recovery/RecoverySource.java
…gs when creating an index Test used `indices.recovery.concurrent_streams` when creating an index but this is a node setting. Moved it to the node settings and added similar settings to speed up concurrent recoveries. Also fixed a misleading log message in ShardRecoveryHandler when logging a remove corruption
Today recovery sources are not cancled if a shard is closed. The recovery target is already cancled when shards are closed but we should also cleanup and cancel the sources side since it holds on to shard locks / references until it's closed.
clintongormley
added
>enhancement
:Distributed/Recovery
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 is a backport of several commits and since it's a biggy I think we should do some review cycles here.