Make the max snapshots database parameter configurable (#3808)

bhartnett · web-flow · commit 6135980d6bff · 2025-11-04T10:27:12.000+08:00
* Log the number of snapshots in memory.

* Make max snapshots configurable.
diff --git a/execution_chain/conf.nim b/execution_chain/conf.nim
@@ -356,6 +356,12 @@ type
       desc: "Rewrite selected network config hash to database"
       name: "debug-rewrite-datadir-id".}: bool
 
+    aristoDbMaxSnapshots* {.
+      hidden
+      defaultValue: defaultMaxSnapshots
+      defaultValueDesc: $defaultMaxSnapshots
+      name: "debug-aristo-db-max-snapshots" .}: int
+
     eagerStateRootCheck* {.
       hidden
       desc: "Eagerly check state roots when syncing finalized blocks"
@@ -780,8 +786,8 @@ func dbOptions*(config: ExecutionClientConf, noKeyCache = false): DbOptions =
       # The import command does not use the key cache - better give it to branch
       if noKeyCache: config.rdbKeyCacheSize + config.rdbBranchCacheSize
       else: config.rdbBranchCacheSize,
-
     rdbPrintStats = config.rdbPrintStats,
+    maxSnapshots = config.aristoDbMaxSnapshots,
   )
 
 {.pop.}
diff --git a/execution_chain/core/chain/forked_chain.nim b/execution_chain/core/chain/forked_chain.nim
@@ -28,6 +28,7 @@ import
     block_quarantine]
 
 from std/sequtils import mapIt
+from std/heapqueue import len
 from web3/engine_api_types import ExecutionPayloadBodyV1
 
 logScope:
@@ -400,15 +401,17 @@ proc processUpdateBase(c: ForkedChainRef): Future[Result[void, string]] {.async:
           base = c.base.number,
           baseHash = c.base.hash.short,
           pendingFCU = c.pendingFCU.short,
-          resolvedFin= c.latestFinalizedBlockNumber
+          resolvedFin = c.latestFinalizedBlockNumber,
+          dbSnapshotsCount = c.baseTxFrame.aTx.db.snapshots.len()
       else:
         debug "Finalized blocks persisted",
           nBlocks = c.persistedCount,
           target = c.base.hash.short,
           base = c.base.number,
           baseHash = c.base.hash.short,
           pendingFCU = c.pendingFCU.short,
-          resolvedFin= c.latestFinalizedBlockNumber
+          resolvedFin = c.latestFinalizedBlockNumber,
+          dbSnapshotsCount = c.baseTxFrame.aTx.db.snapshots.len()
       c.lastBaseLogTime = time
       c.persistedCount = 0
     return ok()
@@ -506,8 +509,6 @@ proc validateBlock(c: ForkedChainRef,
     parentTxFrame=cast[uint](parentFrame),
     txFrame=cast[uint](txFrame)
 
-
-
   var receipts = c.processBlock(parent, txFrame, blk, blkHash, finalized).valueOr:
     txFrame.dispose()
     return err(error)
diff --git a/execution_chain/db/aristo/aristo_init/init_common.nim b/execution_chain/db/aristo/aristo_init/init_common.nim
@@ -13,6 +13,8 @@ import
   ../aristo_desc,
   ../aristo_desc/desc_backend
 
+from ../../opts import defaultMaxSnapshots
+
 const
   verifyIxId = true # and false
     ## Enforce session tracking
@@ -81,12 +83,13 @@ proc finishSession*(hdl: TypedPutHdlRef; db: TypedBackendRef) =
     doAssert db.txId == hdl.txId
     db.txId = 0
 
-proc initInstance*(db: AristoDbRef): Result[void, AristoError] =
+proc initInstance*(db: AristoDbRef, maxSnapshots = defaultMaxSnapshots): Result[void, AristoError] =
+  doAssert maxSnapshots > 0
   let vTop = (?db.getLstFn()).vTop
   db.txRef = AristoTxRef(db: db, vTop: vTop, snapshot: Snapshot(level: Opt.some(0)))
   db.accLeaves = LruCache[Hash32, AccLeafRef].init(ACC_LRU_SIZE)
   db.stoLeaves = LruCache[Hash32, StoLeafRef].init(ACC_LRU_SIZE)
-  db.maxSnapshots = 10
+  db.maxSnapshots = maxSnapshots
   ok()
 
 proc finish*(db: AristoDbRef; eradicate = false) =
diff --git a/execution_chain/db/aristo/aristo_init/persistent.nim b/execution_chain/db/aristo/aristo_init/persistent.nim
@@ -43,7 +43,7 @@ proc init*(
     baseDb: RocksDbInstanceRef;
       ): Result[T, AristoError] =
   let db = rocksDbBackend(opts, baseDb)
-  db.initInstance().isOkOr:
+  db.initInstance(opts.maxSnapshots).isOkOr:
     db.closeFn(eradicate = false)
     return err(error)
   ok db
diff --git a/execution_chain/db/opts.nim b/execution_chain/db/opts.nim
@@ -39,6 +39,8 @@ const
     ## Hashes of the above
   defaultRdbBranchCacheSize* = 1024 * 1024 * 1024
     ## Cache of branches and leaves in the state MPTs (world and account)
+  defaultMaxSnapshots* = 5
+    ## The max number of snapshots to store in the aristo database.
 
 
 type DbOptions* = object # Options that are transported to the database layer
@@ -50,6 +52,7 @@ type DbOptions* = object # Options that are transported to the database layer
   rdbKeyCacheSize*: int
   rdbBranchCacheSize*: int
   rdbPrintStats*: bool
+  maxSnapshots*: int
 
 func init*(
     T: type DbOptions,
@@ -61,6 +64,7 @@ func init*(
     rdbKeyCacheSize = defaultRdbKeyCacheSize,
     rdbBranchCacheSize = defaultRdbBranchCacheSize,
     rdbPrintStats = false,
+    maxSnapshots = defaultMaxSnapshots,
 ): T =
   T(
     maxOpenFiles: maxOpenFiles,
@@ -71,4 +75,5 @@ func init*(
     rdbKeyCacheSize: rdbKeyCacheSize,
     rdbBranchCacheSize: rdbBranchCacheSize,
     rdbPrintStats: rdbPrintStats,
+    maxSnapshots: maxSnapshots,
   )
