Skip to content

some memory optimisations #196

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
7layermagik merged 1 commit into from
Jan 27, 2026
Merged

some memory optimisations #196

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions pkg/accountsdb/accountsdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (accountsDb *AccountsDb) CloseDb() {

func (accountsDb *AccountsDb) InitCaches() {
var err error
accountsDb.VoteAcctCache, err = otter.MustBuilder[solana.PublicKey, *accounts.Account](5000).
accountsDb.VoteAcctCache, err = otter.MustBuilder[solana.PublicKey, *accounts.Account](2500).
Cost(func(key solana.PublicKey, acct *accounts.Account) uint32 {
return 1
}).
Expand All @@ -163,7 +163,7 @@ func (accountsDb *AccountsDb) InitCaches() {
panic(err)
}

accountsDb.ProgramCache, err = otter.MustBuilder[solana.PublicKey, *ProgramCacheEntry](5000).
accountsDb.ProgramCache, err = otter.MustBuilder[solana.PublicKey, *ProgramCacheEntry](2000).
Cost(func(key solana.PublicKey, progEntry *ProgramCacheEntry) uint32 {
return 1
}).
Expand All @@ -172,7 +172,7 @@ func (accountsDb *AccountsDb) InitCaches() {
panic(err)
}

accountsDb.CommonAcctsCache, err = otter.MustBuilder[solana.PublicKey, *accounts.Account](10000).
accountsDb.CommonAcctsCache, err = otter.MustBuilder[solana.PublicKey, *accounts.Account](5000).
Cost(func(key solana.PublicKey, acct *accounts.Account) uint32 {
return 1
}).
Expand Down
11 changes: 11 additions & 0 deletions pkg/replay/block.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,6 +1076,14 @@ func (t *persistedTracker) Get() (uint64, []byte) {
return slot, out
}

func nilifySnapshotManifest(manifest *snapshot.SnapshotManifest) {
manifest.Bank = nil
manifest.AccountsDb = nil
manifest.BankIncrementalSnapshotPersistence = nil
manifest.VersionedEpochStakes = nil
manifest.LtHash = nil
}

func ReplayBlocks(
ctx context.Context,
acctsDb *accountsdb.AccountsDb,
Expand Down Expand Up @@ -1335,6 +1343,9 @@ func ReplayBlocks(
// FRESH START: Use snapshot manifest
configErr = configureInitialBlock(acctsDb, block, snapshotManifest, replayCtx, epochSchedule, rpcc, rpcBackups)
}
// We're done with the SnapshotManifest object. Since these objects are quite large, we hint to the GC to free
// the object's contents by nil'ing the struct's members.
nilifySnapshotManifest(snapshotManifest)
} else {
configErr = configureBlock(block, replayCtx, lastSlotCtx, epochSchedule, rpcc, rpcBackups)
}
Expand Down
9 changes: 6 additions & 3 deletions pkg/snapshot/manifest_decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@ type SerializableEpochRewardStatus struct {
}

type SnapshotManifest struct {
Bank DeserializableVersionedBank
AccountsDb AccountsDbFields
Bank *DeserializableVersionedBank
AccountsDb *AccountsDbFields
LamportsPerSignature uint64
BankIncrementalSnapshotPersistence BankIncrementalSnapshotPersistence
BankIncrementalSnapshotPersistence *BankIncrementalSnapshotPersistence
EpochAccountHash [32]byte
VersionedEpochStakes []VersionedEpochStakesPair
LtHash *lthash.LtHash
Expand Down Expand Up @@ -1413,12 +1413,14 @@ func (stakeRewards *SerializableStakeRewards) UnmarshalWithDecoder(decoder *bin.
func (snapshot *SnapshotManifest) UnmarshalWithDecoder(decoder *bin.Decoder) error {
var err error

snapshot.Bank = new(DeserializableVersionedBank)
err = snapshot.Bank.UnmarshalWithDecoder(decoder)
if err != nil {
util.VerboseHandleError(err)
return err
}

snapshot.AccountsDb = new(AccountsDbFields)
err = snapshot.AccountsDb.UnmarshalWithDecoder(decoder)
if err != nil {
util.VerboseHandleError(err)
Expand All @@ -1442,6 +1444,7 @@ func (snapshot *SnapshotManifest) UnmarshalWithDecoder(decoder *bin.Decoder) err

if hasIncrementalSnapshotPersistence {
mlog.Log.Infof("hasIncrementalSnapshotPersistence")
snapshot.BankIncrementalSnapshotPersistence = new(BankIncrementalSnapshotPersistence)
err = snapshot.BankIncrementalSnapshotPersistence.UnmarshalWithDecoder(decoder)
if err != nil {
return nil
Expand Down