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/protocols/snap: keep complete boundary nodes

Browse source
This commit is contained in:
Gary Rong 2023-10-19 14:14:41 +08:00
parent a43ea13491
commit 7e41beed18
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eth/protocols/snap/sync.go
View file

@ -762,7 +762,9 @@ func (s *Syncer) loadSyncStatus() {
options = options.WithCleaner(func(path []byte) { options = options.WithCleaner(func(path []byte) {
s.cleanPath(task.genBatch, common.Hash{}, path) s.cleanPath(task.genBatch, common.Hash{}, path)
}) })
options = options.SkipBoundary(true, true, boundaryAccountNodesGauge) // Skip the left boundary if it's not the first range.
// Skip the right boundary if it's not the last range.
options = options.SkipBoundary(task.Next != (common.Hash{}), task.Last != common.MaxHash, boundaryAccountNodesGauge)
} }
task.genTrie = trie.NewStackTrie(options) task.genTrie = trie.NewStackTrie(options)
for accountHash, subtasks := range task.SubTasks { for accountHash, subtasks := range task.SubTasks {
@ -787,7 +789,9 @@ func (s *Syncer) loadSyncStatus() {
options = options.WithCleaner(func(path []byte) { options = options.WithCleaner(func(path []byte) {
s.cleanPath(subtask.genBatch, owner, path) s.cleanPath(subtask.genBatch, owner, path)
}) })
options = options.SkipBoundary(true, true, boundaryStorageNodesGauge) // Skip the left boundary if it's not the first range.
// Skip the right boundary if it's not the last range.
options = options.SkipBoundary(subtask.Next != common.Hash{}, subtask.Last != common.MaxHash, boundaryStorageNodesGauge)
} }
subtask.genTrie = trie.NewStackTrie(options) subtask.genTrie = trie.NewStackTrie(options)
} }
@ -852,7 +856,9 @@ func (s *Syncer) loadSyncStatus() {
options = options.WithCleaner(func(path []byte) { options = options.WithCleaner(func(path []byte) {
s.cleanPath(batch, common.Hash{}, path) s.cleanPath(batch, common.Hash{}, path)
}) })
options = options.SkipBoundary(true, true, boundaryAccountNodesGauge) // Skip the left boundary if it's not the first range.
// Skip the right boundary if it's not the last range.
options = options.SkipBoundary(next != common.Hash{}, last != common.MaxHash, boundaryAccountNodesGauge)
} }
s.tasks = append(s.tasks, &accountTask{ s.tasks = append(s.tasks, &accountTask{
Next: next, Next: next,
@ -2060,7 +2066,9 @@ func (s *Syncer) processStorageResponse(res *storageResponse) {
options = options.WithCleaner(func(path []byte) { options = options.WithCleaner(func(path []byte) {
s.cleanPath(batch, owner, path) s.cleanPath(batch, owner, path)
}) })
options.SkipBoundary(true, true, boundaryStorageNodesGauge) // Keep the left boundary as it's the first range.
// Skip the right boundary if it's not the last range.
options.SkipBoundary(false, r.End() != common.MaxHash, boundaryStorageNodesGauge)
} }
tasks = append(tasks, &storageTask{ tasks = append(tasks, &storageTask{
Next: common.Hash{}, Next: common.Hash{},
@ -2087,7 +2095,9 @@ func (s *Syncer) processStorageResponse(res *storageResponse) {
options = options.WithCleaner(func(path []byte) { options = options.WithCleaner(func(path []byte) {
s.cleanPath(batch, owner, path) s.cleanPath(batch, owner, path)
}) })
options.SkipBoundary(true, true, boundaryStorageNodesGauge) // Skip the left boundary as it's not the first range
// Skip the right boundary if it's not the last range.
options.SkipBoundary(true, r.End() != common.MaxHash, boundaryStorageNodesGauge)
} }
tasks = append(tasks, &storageTask{ tasks = append(tasks, &storageTask{
Next: r.Start(), Next: r.Start(),