Return recovery to generic thread post-PRRL action #44000
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
Today we perform `TransportReplicationAction` derivatives during recovery, and these actions call their response handlers on the transport thread. This change moves the continued execution of the recovery back onto the generic threadpool.
DaveCTurner
added
>bug
:Distributed Indexing/Recovery
|
Pinging @elastic/es-distributed |
ywelsch
reviewed
Jul 5, 2019
server/src/main/java/org/elasticsearch/indices/recovery/RecoverySourceHandler.java
Outdated
Show resolved
Hide resolved
DaveCTurner
added a commit
that referenced
this pull request
Jul 5, 2019
Today we perform `TransportReplicationAction` derivatives during recovery, and these actions call their response handlers on the transport thread. This change moves the continued execution of the recovery back onto the generic threadpool.
dnhatn
reviewed
Jul 5, 2019
| @@ -144,8 +146,10 @@ public void recoverToTarget(ActionListener<RecoveryResponse> listener) { | |||
| IOUtils.closeWhileHandlingException(releaseResources, () -> wrappedListener.onFailure(e)); | |||
| throw e; | |||
| }); | |||
| final Consumer<Exception> onFailure = e -> | |||
| final Consumer<Exception> onFailure = e -> { | |||
| Transports.assertNotTransportThread("failure of recovery from " + shard.routingEntry() + " to " + request.targetNode()); | |||
There was a problem hiding this comment.
I think this should be assert Transports.assertNotTransportThread(...).
DaveCTurner
added a commit
to DaveCTurner/elasticsearch
that referenced
this pull request
Jul 5, 2019
In elastic#44000 we introduced some calls to `assertNotTransportThread` that are executed whether assertions are enabled or not. Although they have no effect if assertions are disabled, we should have done it like this instead.
DaveCTurner
added a commit
that referenced
this pull request
Jul 8, 2019
In #44000 we introduced some calls to `assertNotTransportThread` that are executed whether assertions are enabled or not. Although they have no effect if assertions are disabled, we should have done it like this instead.
DaveCTurner
added a commit
that referenced
this pull request
Jul 8, 2019
In #44000 we introduced some calls to `assertNotTransportThread` that are executed whether assertions are enabled or not. Although they have no effect if assertions are disabled, we should have done it like this instead.
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.
Today we perform
TransportReplicationActionderivatives during recovery, andthese actions call their response handlers on the transport thread. This change
moves the continued execution of the recovery back onto the generic threadpool.
Relates #41536.