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: fix skeleton cleanup

Browse source
This commit is contained in:
Gary Rong 2023-11-22 14:58:54 +08:00
parent eaac53ec38
commit 75929ca3e4
2 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eth/downloader/downloader.go
View file

@ -611,6 +611,7 @@ func (d *Downloader) syncWithPeer(p *peerConnection, hash common.Hash, td, ttd *
if err := d.lightchain.SetHead(origin); err != nil { if err := d.lightchain.SetHead(origin); err != nil {
return err return err
} }
log.Info("Truncated excess ancient chain segment", "oldhead", frozen-1, "newhead", origin)
} }
} }
// Initiate the sync using a concurrent header and content retrieval algorithm // Initiate the sync using a concurrent header and content retrieval algorithm

31
eth/downloader/skeleton.go
View file

@ -1120,26 +1120,41 @@ func (s *skeleton) cleanStales(filled *types.Header) error {
number := filled.Number.Uint64() number := filled.Number.Uint64()
log.Trace("Cleaning stale beacon headers", "filled", number, "hash", filled.Hash()) log.Trace("Cleaning stale beacon headers", "filled", number, "hash", filled.Hash())
// If the filled header is below the linked subchain, something's // If the filled header is below and discontinuous with the linked subchain,
// corrupted internally. Report and error and refuse to do anything. // something's corrupted internally. Report and error and refuse to do anything.
if number < s.progress.Subchains[0].Tail { if number+1 < s.progress.Subchains[0].Tail {
return fmt.Errorf("filled header below beacon header tail: %d < %d", number, s.progress.Subchains[0].Tail) return fmt.Errorf("filled header below beacon header tail: %d < %d", number, s.progress.Subchains[0].Tail)
} }
// Determine the new tail based on the given filled header. If it's still
// in the range of skeleton chain, use the next header adjacent to the
// filled one (it's expected to link with the filled one, otherwise
// something corrupted); otherwise use the filled one if the whole skeleton
// chain is consumed.
newTail := filled
if number < s.progress.Subchains[0].Head {
newTail = rawdb.ReadSkeletonHeader(s.db, number+1)
if newTail.ParentHash != filled.Hash() {
return fmt.Errorf("filled header is discontinuous with subchain: %d %s", number, filled.Hash())
}
}
// Subchain seems trimmable, push the tail forward up to the last // Subchain seems trimmable, push the tail forward up to the last
// filled header and delete everything before it - if available. In // filled header and delete everything before it - if available. In
// case we filled past the head, recreate the subchain with a new // case we filled past the head, recreate the subchain with a new
// head to keep it consistent with the data on disk. // head to keep it consistent with the data on disk.
var ( var (
start = s.progress.Subchains[0].Tail // start deleting from the first known header start = s.progress.Subchains[0].Tail // start deleting from the first known header
end = number // delete until the requested threshold end = newTail.Number.Uint64() // delete skeleton headers before the new tail
batch = s.db.NewBatch() batch = s.db.NewBatch()
) )
s.progress.Subchains[0].Tail = number s.progress.Subchains[0].Tail = newTail.Number.Uint64()
s.progress.Subchains[0].Next = filled.ParentHash s.progress.Subchains[0].Next = newTail.ParentHash
// If more headers were filled than available, push the entire subchain
// forward to keep tracking the node's block imports.
//
// Note that the new tail will be the filled one in this case, which is
// unexpected, but we cannot do anything else to improve the situation.
if s.progress.Subchains[0].Head < number { if s.progress.Subchains[0].Head < number {
// If more headers were filled than available, push the entire
// subchain forward to keep tracking the node's block imports
end = s.progress.Subchains[0].Head + 1 // delete the entire original range, including the head end = s.progress.Subchains[0].Head + 1 // delete the entire original range, including the head
s.progress.Subchains[0].Head = number // assign a new head (tail is already assigned to this) s.progress.Subchains[0].Head = number // assign a new head (tail is already assigned to this)