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

eth/downloader: address comments

Browse source
This commit is contained in:
Gary Rong 2024-01-31 15:30:50 +08:00
parent 5b6571fe74
commit eead5a20f8
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
eth/downloader/beaconsync.go
View file

@ -50,7 +50,8 @@ func newBeaconBackfiller(dl *Downloader, success func()) backfiller {
} }
// suspend cancels any background downloader threads and returns the last header // suspend cancels any background downloader threads and returns the last header
// that has been successfully backfilled. // that has been successfully backfilled (potentially in a previous run), or the
// genesis.
func (b *beaconBackfiller) suspend() *types.Header { func (b *beaconBackfiller) suspend() *types.Header {
// If no filling is running, don't waste cycles // If no filling is running, don't waste cycles
b.lock.Lock() b.lock.Lock()

11
eth/downloader/skeleton.go
View file

@ -161,7 +161,7 @@ type backfiller interface {
// on initial startup. // on initial startup.
// //
// The method should return the last block header that has been successfully // The method should return the last block header that has been successfully
// backfilled, or nil if the backfiller was not resumed. // backfilled (in the current or a previous run), falling back to the genesis.
suspend() *types.Header suspend() *types.Header
// resume requests the backfiller to start running fill or snap sync based on // resume requests the backfiller to start running fill or snap sync based on
@ -382,7 +382,11 @@ func (s *skeleton) sync(head *types.Header) (*types.Header, error) {
done := make(chan struct{}) done := make(chan struct{})
go func() { go func() {
defer close(done) defer close(done)
if filled := s.filler.suspend(); filled != nil { filled := s.filler.suspend()
if filled == nil {
log.Error("Latest filled block is not available")
return
}
// If something was filled, try to delete stale sync helpers. If // If something was filled, try to delete stale sync helpers. If
// unsuccessful, warn the user, but not much else we can do (it's // unsuccessful, warn the user, but not much else we can do (it's
// a programming error, just let users report an issue and don't // a programming error, just let users report an issue and don't
@ -390,7 +394,6 @@ func (s *skeleton) sync(head *types.Header) (*types.Header, error) {
if err := s.cleanStales(filled); err != nil { if err := s.cleanStales(filled); err != nil {
log.Error("Failed to clean stale beacon headers", "err", err) log.Error("Failed to clean stale beacon headers", "err", err)
} }
}
}() }()
// Wait for the suspend to finish, consuming head events in the meantime // Wait for the suspend to finish, consuming head events in the meantime
// and dropping them on the floor. // and dropping them on the floor.
@ -1138,7 +1141,7 @@ func (s *skeleton) cleanStales(filled *types.Header) error {
// The skeleton chain is partially consumed, set the new tail as filled+1. // The skeleton chain is partially consumed, set the new tail as filled+1.
tail := rawdb.ReadSkeletonHeader(s.db, number+1) tail := rawdb.ReadSkeletonHeader(s.db, number+1)
if tail.ParentHash != filled.Hash() { if tail.ParentHash != filled.Hash() {
return fmt.Errorf("filled header is discontinuous with subchain: %d %s", number, filled.Hash()) return fmt.Errorf("filled header is discontinuous with subchain: %d %s, please file an issue", number, filled.Hash())
} }
start, end = s.progress.Subchains[0].Tail, number+1 // remove headers in [tail, filled] start, end = s.progress.Subchains[0].Tail, number+1 // remove headers in [tail, filled]
s.progress.Subchains[0].Tail = tail.Number.Uint64() s.progress.Subchains[0].Tail = tail.Number.Uint64()