Skip to content
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

Jump to bottom

fix memory leak in StateAtBlock #264

Merged
merged 4 commits into from
Oct 31, 2023
Merged

fix memory leak in StateAtBlock #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9e463e
add cleans cache finalizer, trigger the cleaning early when recreatin…
magicxyyz Oct 23, 2023
725dd41
Merge branch 'master' into fix-state-at-block-memory-leak
magicxyyz Oct 24, 2023
cad8845
Merge branch 'master' into fix-state-at-block-memory-leak
magicxyyz Oct 24, 2023
c4f5293
Merge branch 'master' into fix-state-at-block-memory-leak
magicxyyz Oct 26, 2023
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: 2 additions & 0 deletions eth/state_accessor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ func (eth *Ethereum) StateAtBlock(ctx context.Context, block *types.Block, reexe
// Create an ephemeral trie.Database for isolating the live one. Otherwise
// the internal junks created by tracing will be persisted into the disk.
database = state.NewDatabaseWithConfig(eth.chainDb, &trie.Config{Cache: 16})
defer database.TrieDB().ResetCleans()
if statedb, err = state.New(block.Root(), database, nil); err == nil {
log.Info("Found disk backend for state trie", "root", block.Root(), "number", block.Number())
return statedb, noopReleaser, nil
Expand All @@ -100,6 +101,7 @@ func (eth *Ethereum) StateAtBlock(ctx context.Context, block *types.Block, reexe
// Create an ephemeral trie.Database for isolating the live one. Otherwise
// the internal junks created by tracing will be persisted into the disk.
database = state.NewDatabaseWithConfig(eth.chainDb, &trie.Config{Cache: 16})
defer database.TrieDB().ResetCleans()

// If we didn't check the live database, do check state over ephemeral database,
// otherwise we would rewind past a persisted block (specific corner case is
Expand Down
8 changes: 8 additions & 0 deletions trie/database_wrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ func prepare(diskdb ethdb.Database, config *Config) *Database {
} else {
cleans = fastcache.LoadFromFileOrNew(config.Journal, config.Cache*1024*1024)
}
runtime.SetFinalizer(cleans, func(c *fastcache.Cache) { c.Reset() })
}
var preimages *preimageStore
if config != nil && config.Preimages {
Expand All @@ -97,6 +98,13 @@ func prepare(diskdb ethdb.Database, config *Config) *Database {
}
}

// resets fastcache to return memory chunks to pool of free chunks
func (db *Database) ResetCleans() {
if db.cleans != nil {
db.cleans.Reset()
}
}

// NewDatabase initializes the trie database with default settings, namely
// the legacy hash-based scheme is used by default.
func NewDatabase(diskdb ethdb.Database) *Database {
Expand Down