cmd/utils: grant snapshot cache to trie if disabled (#21416)

* cmd/utils: grant snapshot cache to trie if disabled

* eth: fix up default non-mainnet cache distribution
This commit is contained in:
Péter Szilágyi 2020-08-06 15:28:31 +03:00 committed by GitHub
parent 5d4512b113
commit 68754f3931
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

@ -1542,6 +1542,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
cfg.SnapshotCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheSnapshotFlag.Name) / 100 cfg.SnapshotCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheSnapshotFlag.Name) / 100
} }
if !ctx.GlobalIsSet(SnapshotFlag.Name) { if !ctx.GlobalIsSet(SnapshotFlag.Name) {
cfg.TrieCleanCache += cfg.SnapshotCache
cfg.SnapshotCache = 0 // Disabled cfg.SnapshotCache = 0 // Disabled
} }
if ctx.GlobalIsSet(DocRootFlag.Name) { if ctx.GlobalIsSet(DocRootFlag.Name) {

@ -61,12 +61,12 @@ var DefaultConfig = Config{
LightPeers: 100, LightPeers: 100,
UltraLightFraction: 75, UltraLightFraction: 75,
DatabaseCache: 512, DatabaseCache: 512,
TrieCleanCache: 256, TrieCleanCache: 154,
TrieCleanCacheJournal: "triecache", TrieCleanCacheJournal: "triecache",
TrieCleanCacheRejournal: 60 * time.Minute, TrieCleanCacheRejournal: 60 * time.Minute,
TrieDirtyCache: 256, TrieDirtyCache: 256,
TrieTimeout: 60 * time.Minute, TrieTimeout: 60 * time.Minute,
SnapshotCache: 256, SnapshotCache: 102,
Miner: miner.Config{ Miner: miner.Config{
GasFloor: 8000000, GasFloor: 8000000,
GasCeil: 8000000, GasCeil: 8000000,