tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eth/downloader: fix for Issue #16539 (#16546)

Browse Source
This commit is contained in:
Domino Valdano 2018-04-23 00:01:21 -07:00 committed by Péter Szilágyi
parent 744428cb03
commit 7cf83cee52
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eth/downloader/downloader.go
View File

@ -306,7 +306,7 @@ func (d *Downloader) UnregisterPeer(id string) error {
d.cancelLock.RUnlock() d.cancelLock.RUnlock()
if master { if master {
d.Cancel() d.cancel()
} }
return nil return nil
} }
@ -501,8 +501,10 @@ func (d *Downloader) spawnSync(fetchers []func() error) error {
return err return err
} }
// Cancel cancels all of the operations and resets the queue. // cancel aborts all of the operations and resets the queue. However, cancel does
func (d *Downloader) Cancel() { // not wait for the running download goroutines to finish. This method should be
// used when cancelling the downloads from inside the downloader.
func (d *Downloader) cancel() {
// Close the current cancel channel // Close the current cancel channel
d.cancelLock.Lock() d.cancelLock.Lock()
if d.cancelCh != nil { if d.cancelCh != nil {
@ -514,6 +516,12 @@ func (d *Downloader) Cancel() {
} }
} }
d.cancelLock.Unlock() d.cancelLock.Unlock()
}
// Cancel aborts all of the operations and waits for all download goroutines to
// finish before returning.
func (d *Downloader) Cancel() {
d.cancel()
d.cancelWg.Wait() d.cancelWg.Wait()
} }