From ed34a5e08a475fdf1b3116b1f17879411bfe411d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Mon, 1 Apr 2019 11:52:11 +0300
Subject: cmd, core, eth: support disabling the concurrent state prefetcher
---
cmd/geth/main.go | 1 +
cmd/geth/usage.go | 1 +
cmd/utils/flags.go | 14 ++++++++++----
3 files changed, 12 insertions(+), 4 deletions(-)
(limited to 'cmd')
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 83847fc53..0763a9ed3 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -102,6 +102,7 @@ var (
utils.CacheDatabaseFlag,
utils.CacheTrieFlag,
utils.CacheGCFlag,
+ utils.CacheNoPrefetchFlag,
utils.ListenPortFlag,
utils.MaxPeersFlag,
utils.MaxPendingPeersFlag,
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go
index 8658a3fdc..f1fb22f18 100644
--- a/cmd/geth/usage.go
+++ b/cmd/geth/usage.go
@@ -139,6 +139,7 @@ var AppHelpFlagGroups = []flagGroup{
utils.CacheDatabaseFlag,
utils.CacheTrieFlag,
utils.CacheGCFlag,
+ utils.CacheNoPrefetchFlag,
},
},
{
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index bf433242e..bff301579 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -349,6 +349,10 @@ var (
Usage: "Percentage of cache memory allowance to use for trie pruning (default = 25% full mode, 0% archive mode)",
Value: 25,
}
+ CacheNoPrefetchFlag = cli.BoolFlag{
+ Name: "cache.noprefetch",
+ Usage: "Disable heuristic state prefetch during block import (less CPU and disk IO, more time waiting for data)",
+ }
// Miner settings
MiningEnabledFlag = cli.BoolFlag{
Name: "mine",
@@ -1336,6 +1340,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
Fatalf("--%s must be either 'full' or 'archive'", GCModeFlag.Name)
}
cfg.NoPruning = ctx.GlobalString(GCModeFlag.Name) == "archive"
+ cfg.NoPrefetch = ctx.GlobalBool(CacheNoPrefetchFlag.Name)
if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheTrieFlag.Name) {
cfg.TrieCleanCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheTrieFlag.Name) / 100
@@ -1595,10 +1600,11 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
Fatalf("--%s must be either 'full' or 'archive'", GCModeFlag.Name)
}
cache := &core.CacheConfig{
- Disabled: ctx.GlobalString(GCModeFlag.Name) == "archive",
- TrieCleanLimit: eth.DefaultConfig.TrieCleanCache,
- TrieDirtyLimit: eth.DefaultConfig.TrieDirtyCache,
- TrieTimeLimit: eth.DefaultConfig.TrieTimeout,
+ TrieCleanLimit: eth.DefaultConfig.TrieCleanCache,
+ TrieCleanNoPrefetch: ctx.GlobalBool(CacheNoPrefetchFlag.Name),
+ TrieDirtyLimit: eth.DefaultConfig.TrieDirtyCache,
+ TrieDirtyDisabled: ctx.GlobalString(GCModeFlag.Name) == "archive",
+ TrieTimeLimit: eth.DefaultConfig.TrieTimeout,
}
if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheTrieFlag.Name) {
cache.TrieCleanLimit = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheTrieFlag.Name) / 100
--
cgit v1.2.3