forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-15 08:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

eth/downloader: don't signal sync startup before fetchers register for cancellation (#35515)

Browse source 
Close the started signal only after the fetchers are registered on
cancelWg, so suspend's Cancel actually waits for them instead of racing
the registration.
This commit is contained in:
0xSHKWON 2026-08-12 16:31:51 +09:00 committed by GitHub
parent 8f1a3fee9f
commit ceced06cb0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
eth/downloader/downloader.go
View file

@ -365,8 +365,8 @@ func (d *Downloader) synchronise(beaconPing chan struct{}) (err error) {
// The beacon header syncer is async. It will start this synchronization and // The beacon header syncer is async. It will start this synchronization and
// will continue doing other tasks. However, if synchronization needs to be // will continue doing other tasks. However, if synchronization needs to be
// cancelled, the syncer needs to know if we reached the startup point (and // cancelled, the syncer needs to know if we reached the startup point (and
// inited the cancel channel) or not yet. Make sure that we'll signal even in // registered the fetchers for cancellation) or not yet. Make sure that we'll
// case of a failure. // signal even in case of a failure.
if beaconPing != nil { if beaconPing != nil {
defer func() { defer func() {
select { select {
@ -435,10 +435,7 @@ func (d *Downloader) synchronise(beaconPing chan struct{}) (err error) {
d.mode.Store(uint32(mode)) d.mode.Store(uint32(mode))
defer d.mode.Store(0) defer d.mode.Store(0)
if beaconPing != nil { return d.syncToHead(beaconPing)
close(beaconPing)
}
return d.syncToHead()
} }
// getMode returns the sync mode used within current cycle. // getMode returns the sync mode used within current cycle.
@ -459,7 +456,7 @@ func (d *Downloader) SubscribeSyncEvents(ch chan<- SyncEvent) event.Subscription
// syncToHead starts a block synchronization based on the hash chain from // syncToHead starts a block synchronization based on the hash chain from
// the specified head hash. // the specified head hash.
func (d *Downloader) syncToHead() (err error) { func (d *Downloader) syncToHead(beaconPing chan struct{}) (err error) {
mode := d.getMode() mode := d.getMode()
d.feed.Send(SyncEvent{Type: SyncStarted, Mode: mode}) d.feed.Send(SyncEvent{Type: SyncStarted, Mode: mode})
defer func() { defer func() {
@ -643,14 +640,21 @@ func (d *Downloader) syncToHead() (err error) {
} else if mode == ethconfig.FullSync { } else if mode == ethconfig.FullSync {
fetchers = append(fetchers, func() error { return d.processFullSyncContent() }) fetchers = append(fetchers, func() error { return d.processFullSyncContent() })
} }
return d.spawnSync(fetchers) return d.spawnSync(fetchers, beaconPing)
} }
// spawnSync runs d.process and all given fetcher functions to completion in // spawnSync runs d.process and all given fetcher functions to completion in
// separate goroutines, returning the first error that appears. // separate goroutines, returning the first error that appears.
func (d *Downloader) spawnSync(fetchers []func() error) error { func (d *Downloader) spawnSync(fetchers []func() error, beaconPing chan struct{}) error {
errc := make(chan error, len(fetchers)) errc := make(chan error, len(fetchers))
d.cancelWg.Add(len(fetchers)) d.cancelWg.Add(len(fetchers))
// Only now that the fetchers are registered on the cancellation WaitGroup
// can a concurrent Cancel wait for them instead of racing the registration;
// signal the beacon syncer that it's safe to cancel.
if beaconPing != nil {
close(beaconPing)
}
for _, fn := range fetchers { for _, fn := range fetchers {
go func() { defer d.cancelWg.Done(); errc <- fn() }() go func() { defer d.cancelWg.Done(); errc <- fn() }()
} }