roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

eth/downloader: fix cornercase when clean stale beacon headers (#26441)

Browse Source
This commit is contained in:
rjl493456442 2023-01-12 18:19:16 +08:00 committed by GitHub
parent 6f858fa806
commit b748709a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eth/downloader/skeleton.go
View File

@ -1102,6 +1102,7 @@ func (s *skeleton) cleanStales(filled *types.Header) error {
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 = number // delete until the requested threshold
batch = s.db.NewBatch()
) )
s.progress.Subchains[0].Tail = number s.progress.Subchains[0].Tail = number
s.progress.Subchains[0].Next = filled.ParentHash s.progress.Subchains[0].Next = filled.ParentHash
@ -1111,16 +1112,13 @@ func (s *skeleton) cleanStales(filled *types.Header) error {
// subchain forward to keep tracking the node's block imports // 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)
}
// Execute the trimming and the potential rewiring of the progress
batch := s.db.NewBatch()
if end != number {
// The entire original skeleton chain was deleted and a new one // The entire original skeleton chain was deleted and a new one
// defined. Make sure the new single-header chain gets pushed to // defined. Make sure the new single-header chain gets pushed to
// disk to keep internal state consistent. // disk to keep internal state consistent.
rawdb.WriteSkeletonHeader(batch, filled) rawdb.WriteSkeletonHeader(batch, filled)
} }
// Execute the trimming and the potential rewiring of the progress
s.saveSyncStatus(batch) s.saveSyncStatus(batch)
for n := start; n < end; n++ { for n := start; n < end; n++ {
// If the batch grew too big, flush it and continue with a new batch. // If the batch grew too big, flush it and continue with a new batch.
@ -1176,8 +1174,13 @@ func (s *skeleton) Bounds() (head *types.Header, tail *types.Header, err error)
return nil, nil, err return nil, nil, err
} }
head = rawdb.ReadSkeletonHeader(s.db, progress.Subchains[0].Head) head = rawdb.ReadSkeletonHeader(s.db, progress.Subchains[0].Head)
if head == nil {
return nil, nil, fmt.Errorf("head skeleton header %d is missing", progress.Subchains[0].Head)
}
tail = rawdb.ReadSkeletonHeader(s.db, progress.Subchains[0].Tail) tail = rawdb.ReadSkeletonHeader(s.db, progress.Subchains[0].Tail)
if tail == nil {
return nil, nil, fmt.Errorf("tail skeleton header %d is missing", progress.Subchains[0].Tail)
}
return head, tail, nil return head, tail, nil
} }