Skip to content

core/state: log progress during dump #22787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
holiman wants to merge 1 commit into from
Closed

core/state: log progress during dump #22787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions core/state/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package state
import (
"encoding/json"
"fmt"
"time"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down Expand Up @@ -112,11 +113,16 @@ func (d iterativeDump) OnRoot(root common.Hash) {
}

func (s *StateDB) DumpToCollector(c DumpCollector, excludeCode, excludeStorage, excludeMissingPreimages bool, start []byte, maxResults int) (nextKey []byte) {
missingPreimages := 0
c.OnRoot(s.trie.Hash())

var count int
it := trie.NewIterator(s.trie.NodeIterator(start))
var (
missingPreimages = 0
count int
it = trie.NewIterator(s.trie.NodeIterator(start))
logged = time.Now()
startTime = time.Now()
)

for it.Next() {
var data Account
if err := rlp.DecodeBytes(it.Value, &data); err != nil {
Expand All @@ -129,6 +135,12 @@ func (s *StateDB) DumpToCollector(c DumpCollector, excludeCode, excludeStorage,
CodeHash: common.Bytes2Hex(data.CodeHash),
}
addrBytes := s.trie.GetKey(it.Key)
if time.Since(logged) > 10*time.Second {
logged = time.Now()
log.Info("State iteration in progress",
"at", fmt.Sprintf("%x", addrBytes),
"elapsed", common.PrettyDuration(time.Since(startTime)))
}
if addrBytes == nil {
// Preimage missing
missingPreimages++
Expand Down