Skip to content

eth, triedb/pathdb: permit write buffer allowance in PBSS archive mode #32091

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

Merged
rjl493456442 merged 2 commits into from
Jun 25, 2025
Merged

eth, triedb/pathdb: permit write buffer allowance in PBSS archive mode #32091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71247ff
eth, triedb/pathdb: permit write buffer allowance in PBSS archive mode
rjl493456442 Jun 25, 2025
deef42c
triedb/pathdb: add more logs
rjl493456442 Jun 25, 2025
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
2 changes: 1 addition & 1 deletion eth/backend.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
log.Warn("Sanitizing invalid miner gas price", "provided", config.Miner.GasPrice, "updated", ethconfig.Defaults.Miner.GasPrice)
config.Miner.GasPrice = new(big.Int).Set(ethconfig.Defaults.Miner.GasPrice)
}
if config.NoPruning && config.TrieDirtyCache > 0 {
if config.NoPruning && config.TrieDirtyCache > 0 && config.StateScheme == rawdb.HashScheme {
if config.SnapshotCache > 0 {
config.TrieCleanCache += config.TrieDirtyCache * 3 / 5
config.SnapshotCache += config.TrieDirtyCache * 2 / 5
Expand Down
24 changes: 15 additions & 9 deletions triedb/pathdb/history_indexer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,11 @@ func (b *batchIndexer) finish(force bool) error {
return nil
}
var (
batch = b.db.NewBatch()
batchMu sync.RWMutex
eg errgroup.Group
batch = b.db.NewBatch()
batchMu sync.RWMutex
storages int
start = time.Now()
eg errgroup.Group
)
eg.SetLimit(runtime.NumCPU())

Expand Down Expand Up @@ -167,6 +169,7 @@ func (b *batchIndexer) finish(force bool) error {
})
}
for addrHash, slots := range b.storages {
storages += len(slots)
for storageHash, idList := range slots {
eg.Go(func() error {
if !b.delete {
Expand Down Expand Up @@ -216,6 +219,7 @@ func (b *batchIndexer) finish(force bool) error {
if err := batch.Write(); err != nil {
return err
}
log.Debug("Committed batch indexer", "accounts", len(b.accounts), "storages", storages, "records", b.counter, "elapsed", common.PrettyDuration(time.Since(start)))
b.counter = 0
b.accounts = make(map[common.Hash][]uint64)
b.storages = make(map[common.Hash]map[common.Hash][]uint64)
Expand All @@ -224,9 +228,10 @@ func (b *batchIndexer) finish(force bool) error {

// indexSingle processes the state history with the specified ID for indexing.
func indexSingle(historyID uint64, db ethdb.KeyValueStore, freezer ethdb.AncientReader) error {
defer func(start time.Time) {
start := time.Now()
defer func() {
indexHistoryTimer.UpdateSince(start)
}(time.Now())
}()

metadata := loadIndexMetadata(db)
if metadata == nil || metadata.Last+1 != historyID {
Expand All @@ -247,15 +252,16 @@ func indexSingle(historyID uint64, db ethdb.KeyValueStore, freezer ethdb.Ancient
if err := b.finish(true); err != nil {
return err
}
log.Debug("Indexed state history", "id", historyID)
log.Debug("Indexed state history", "id", historyID, "elapsed", common.PrettyDuration(time.Since(start)))
return nil
}

// unindexSingle processes the state history with the specified ID for unindexing.
func unindexSingle(historyID uint64, db ethdb.KeyValueStore, freezer ethdb.AncientReader) error {
defer func(start time.Time) {
start := time.Now()
defer func() {
unindexHistoryTimer.UpdateSince(start)
}(time.Now())
}()

metadata := loadIndexMetadata(db)
if metadata == nil || metadata.Last != historyID {
Expand All @@ -276,7 +282,7 @@ func unindexSingle(historyID uint64, db ethdb.KeyValueStore, freezer ethdb.Ancie
if err := b.finish(true); err != nil {
return err
}
log.Debug("Unindexed state history", "id", historyID)
log.Debug("Unindexed state history", "id", historyID, "elapsed", common.PrettyDuration(time.Since(start)))
return nil
}

Expand Down