Allow to cancel recovery sources when shards are closed #8555
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
| final Set<ShardRecoveryHandler> shardRecoveryHandlers = ongoingRecoveries.get(shard); | ||
| if (shardRecoveryHandlers != null) { | ||
| for (ShardRecoveryHandler handlers : shardRecoveryHandlers) { | ||
| handlers.cancel(reason); |
There was a problem hiding this comment.
We should catch any exceptions during the cancel and log them so we can continue to cancel any other handlers? Otherwise the first exception will cause us to bail
There was a problem hiding this comment.
@dakrone there is nothing that can throw an exception there really today but I will add it, it might barf in the future
s1monw
force-pushed
the
cancel_recovery_source
branch
from
7518e79
to
e955110
Compare
|
@dakrone pushed a new commit |
| shardRecoveryHandlers = new HashSet<>(); | ||
| ongoingRecoveries.put(shard, shardRecoveryHandlers); | ||
| } | ||
| assert shardRecoveryHandlers.contains(handler) == false : "Handler was alread registered [" + handler + "]"; |
There was a problem hiding this comment.
might also want to add a toString implementation on ShardRecoveryHandler or add the shard in question to the assert.
|
I left some cosmetics related comments. O.w. LGTM. I lovel the CancelableThreads - will come handy in other places. |
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.
s1monw
force-pushed
the
cancel_recovery_source
branch
from
e955110
to
043f18d
Compare
|
haven't ported this to 1.5 yet... |
clintongormley
added
the
:Distributed/Recovery
clintongormley
changed the title
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 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.