cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

eth/downloader: allow all timers to exit

Browse Source
This commit is contained in:
Martin Holst Swende 2020-08-10 10:42:33 +02:00
parent 8f24097836
commit 7cee2509c0
No known key found for this signature in database
GPG Key ID: 683B438C05A5DDF0
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eth/downloader/statesync.go
View File

@ -197,12 +197,7 @@ func (d *Downloader) runStateSync(s *stateSync) *stateSync {
} }
// Start a timer to notify the sync loop if the peer stalled. // Start a timer to notify the sync loop if the peer stalled.
req.timer = time.AfterFunc(req.timeout, func() { req.timer = time.AfterFunc(req.timeout, func() {
select { timeout <- req
case timeout <- req:
case <-s.done:
// Prevent leaking of timer goroutines in the unlikely case where a
// timer is fired just before exiting runStateSync.
}
}) })
active[req.peer.id] = req active[req.peer.id] = req
} }
@ -214,7 +209,6 @@ func (d *Downloader) runStateSync(s *stateSync) *stateSync {
// are marked as idle and de facto _are_ idle. // are marked as idle and de facto _are_ idle.
func (d *Downloader) spindownStateSync(active map[string]*stateReq, finished []*stateReq, timeout chan *stateReq, peerDrop chan *peerConnection) { func (d *Downloader) spindownStateSync(active map[string]*stateReq, finished []*stateReq, timeout chan *stateReq, peerDrop chan *peerConnection) {
log.Trace("State sync spinning down", "active", len(active), "finished", len(finished)) log.Trace("State sync spinning down", "active", len(active), "finished", len(finished))
for len(active) > 0 { for len(active) > 0 {
var ( var (
req *stateReq req *stateReq