eth: fix shutdown regression to abort downloads, not just cancel #20988
+3
−2
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
holiman
reviewed
Apr 27, 2020
| @@ -222,7 +222,7 @@ func (cs *chainSyncer) loop() { | |||
|
|
|||
| case <-cs.pm.quitSync: | |||
| if cs.doneCh != nil { | |||
| cs.pm.downloader.Cancel() | |||
| cs.pm.downloader.Terminate() // Double term is fine, Cancel would block until queue is emptied | |||
There was a problem hiding this comment.
Terminate calls Cancel too... ?
There was a problem hiding this comment.
But it closes a quit channel first so that intenral components know they need to die, not just not-restart
7 tasks
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.
Fixes #20975
I still managed to hang it once, but not general, so there might be something still in there, but at least most hangs are fixed.