fix: TriesInmemory specified but not work (#350)

* fix: TriesInmemory specified but not work * change warning log when TriesInMemory isn't default
bnb-chain · Aug 9, 2021 · 3bd4e29 · 3bd4e29
1 parent 69ce7f1
commit 3bd4e29
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -1598,6 +1598,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
  if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheGCFlag.Name) {
  cfg.TrieDirtyCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheGCFlag.Name) / 100
  }
+ if ctx.GlobalIsSet(TriesInMemoryFlag.Name) {
+ cfg.TriesInMemory = ctx.GlobalUint64(TriesInMemoryFlag.Name)
+ }
  if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheSnapshotFlag.Name) {
  cfg.SnapshotCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheSnapshotFlag.Name) / 100
  }
@@ -1924,6 +1927,9 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
  if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheGCFlag.Name) {
  cache.TrieDirtyLimit = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheGCFlag.Name) / 100
  }
+ if ctx.GlobalIsSet(TriesInMemoryFlag.Name) {
+ cache.TriesInMemory = ctx.GlobalUint64(TriesInMemoryFlag.Name)
+ }
  vmcfg := vm.Config{EnablePreimageRecording: ctx.GlobalBool(VMEnableDebugFlag.Name)}
 
  // TODO(rjl493456442) disable snapshot generation/wiping if the chain is read only.

diff --git a/core/blockchain.go b/core/blockchain.go
@@ -217,6 +217,9 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
  if cacheConfig == nil {
  cacheConfig = defaultCacheConfig
  }
+ if cacheConfig.TriesInMemory != 128 {
+ log.Warn("TriesInMemory isn't the default value(128), you need specify exact same TriesInMemory when prune data", "triesInMemory", cacheConfig.TriesInMemory)
+ }
  bodyCache, _ := lru.New(bodyCacheLimit)
  bodyRLPCache, _ := lru.New(bodyCacheLimit)
  receiptsCache, _ := lru.New(receiptsCacheLimit)