forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-18 02:40:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/tracers: avoid unsyncronized mutations on trie database #23632 (#1261)

Browse source
This commit is contained in:
Daniel Liu 2025-08-26 15:26:19 +08:00 committed by GitHub
parent 98f6825514
commit 32ed739110
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
eth/tracers/api.go
View file

@ -288,7 +288,11 @@ func (api *API) traceChain(ctx context.Context, start, end *types.Block, config
}() }()
} }
// Start a goroutine to feed all the blocks into the tracers // Start a goroutine to feed all the blocks into the tracers
begin := time.Now() var (
begin = time.Now()
derefTodo []common.Hash // list of hashes to dereference from the db
derefsMu sync.Mutex // mutex for the derefs
)
go func() { go func() {
var ( var (
@ -316,6 +320,14 @@ func (api *API) traceChain(ctx context.Context, start, end *types.Block, config
}() }()
// Feed all the blocks both into the tracer, as well as fast process concurrently // Feed all the blocks both into the tracer, as well as fast process concurrently
for number = start.NumberU64(); number < end.NumberU64(); number++ { for number = start.NumberU64(); number < end.NumberU64(); number++ {
// clean out any derefs
derefsMu.Lock()
for _, h := range derefTodo {
statedb.Database().TrieDB().Dereference(h)
}
derefTodo = derefTodo[:0]
derefsMu.Unlock()
// Print progress logs if long enough time elapsed // Print progress logs if long enough time elapsed
if time.Since(logged) > 8*time.Second { if time.Since(logged) > 8*time.Second {
logged = time.Now() logged = time.Now()
@ -370,12 +382,11 @@ func (api *API) traceChain(ctx context.Context, start, end *types.Block, config
Hash: res.block.Hash(), Hash: res.block.Hash(),
Traces: res.results, Traces: res.results,
} }
// Schedule any parent tries held in memory by this task for dereferencing
done[uint64(result.Block)] = result done[uint64(result.Block)] = result
derefsMu.Lock()
// Dereference any parent tries held in memory by this task derefTodo = append(derefTodo, res.rootref)
if res.statedb.Database().TrieDB() != nil { derefsMu.Unlock()
res.statedb.Database().TrieDB().Dereference(res.rootref)
}
// Stream completed traces to the user, aborting on the first error // Stream completed traces to the user, aborting on the first error
for result, ok := done[next]; ok; result, ok = done[next] { for result, ok := done[next]; ok; result, ok = done[next] {
if len(result.Traces) > 0 || next == end.NumberU64() { if len(result.Traces) > 0 || next == end.NumberU64() {