forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 05:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

triedb/pathdb: fix index proress

Browse source
This commit is contained in:
Gary Rong 2025-08-15 10:38:09 +08:00
parent 176c6fb1a6
commit 8a229c8d48
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
triedb/pathdb/database_test.go
View file

@ -974,6 +974,13 @@ func TestDatabaseIndexRecovery(t *testing.T) {
t.Fatalf("Unexpected state history found, %d", i) t.Fatalf("Unexpected state history found, %d", i)
} }
} }
remain, err := env.db.IndexProgress()
if err != nil {
t.Fatalf("Failed to obtain the progress, %v", err)
}
if remain == 0 {
t.Fatalf("Unexpected progress remain, %d", remain)
}
// Apply new states on top, ensuring state indexing can respond correctly // Apply new states on top, ensuring state indexing can respond correctly
for i := dIndex + 1; i < len(roots); i++ { for i := dIndex + 1; i < len(roots); i++ {
@ -981,6 +988,13 @@ func TestDatabaseIndexRecovery(t *testing.T) {
panic(fmt.Errorf("failed to update state changes, err: %w", err)) panic(fmt.Errorf("failed to update state changes, err: %w", err))
} }
} }
remain, err = env.db.IndexProgress()
if err != nil {
t.Fatalf("Failed to obtain the progress, %v", err)
}
if remain != 0 {
t.Fatalf("Unexpected progress remain, %d", remain)
}
waitIndexing(env.db) waitIndexing(env.db)
// Ensure the truncated state histories become accessible // Ensure the truncated state histories become accessible

2
triedb/pathdb/history_indexer.go
View file

@ -372,7 +372,7 @@ func (i *indexIniter) remain() uint64 {
last, indexed := i.last.Load(), i.indexed.Load() last, indexed := i.last.Load(), i.indexed.Load()
if last < indexed { if last < indexed {
log.Warn("State indexer is in recovery", "indexed", indexed, "last", last) log.Warn("State indexer is in recovery", "indexed", indexed, "last", last)
return 0 return indexed - last
} }
return last - indexed return last - indexed
} }