[R4R] fix: graceful shutdown bug #509
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
…fExtension can't receive exit signal
yutianwu
reviewed
Nov 3, 2021
| @@ -33,6 +33,15 @@ func (h *diffHandler) Chain() *core.BlockChain { return h.chain } | |||
| // RunPeer is invoked when a peer joins on the `diff` protocol. | |||
| func (h *diffHandler) RunPeer(peer *diff.Peer, hand diff.Handler) error { | |||
| if err := peer.Handshake(h.diffSync); err != nil { | |||
| // ensure that waitDiffExtension receives the exit signal normally | |||
There was a problem hiding this comment.
need to add lock for peers
yutianwu
approved these changes
Nov 3, 2021
unclezoro
reviewed
Nov 3, 2021
| delete(ps.diffWait, id) | ||
| wait <- peer | ||
| } | ||
| ps.lock.Unlock() | ||
| return err |
There was a problem hiding this comment.
What is the error that you observe?
unclezoro
approved these changes
Nov 8, 2021
This was referenced Nov 10, 2021
Merged
Merged
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.
fix: graceful shutdown bug
Description
delete(ps.diffWait, id)while the handshake fails onhandler_diff.goRationale
The preceding error occurs multiple times when node
stop(). Wait channel inwaitDiffExtensioncan't exit normally.In
runEthPeerofeth/handler.go, if the peer has adiffextension, wait for it to connect throughpeerset.diffWaitchannel.While
RunPeerofeth/handler_diff.goruns, if thepeer.Handshakeis successful,peerset.diffWait[id]will exit and be removed. If it it not successful,peerset.diffWait[id]onwaitDiffExtensionwill keep waiting. Which causedgraceful shutdowncannot be enabledExample
add an example CLI or API response...
Changes
Notable changes:
Preflight checks
make build)make test)Already reviewed by
...
Related issues
#479