forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 07:06:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed --cache.trie.journal and --cache.trie.rejournal wrt geth v1.12.2 merge

Browse source
This commit is contained in:
Pratik Patil 2023-11-08 17:11:54 +05:30
parent ae99b47a7c
commit 6aed36d9d1
No known key found for this signature in database
GPG key ID: D883140B4FA928F6
13 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/files/config.toml
View file

@ -150,8 +150,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
docs/cli/example_config.toml
View file

@ -155,8 +155,6 @@ devfakeauthor = false # Run miner without validator set authorization
snapshot = 10 # Percentage of cache memory allowance to use for snapshot caching (default = 10% full mode, 20% archive mode) snapshot = 10 # Percentage of cache memory allowance to use for snapshot caching (default = 10% full mode, 20% archive mode)
database = 50 # Percentage of cache memory allowance to use for database io database = 50 # Percentage of cache memory allowance to use for database io
trie = 15 # Percentage of cache memory allowance to use for trie caching (default = 15% full mode, 30% archive mode) trie = 15 # Percentage of cache memory allowance to use for trie caching (default = 15% full mode, 30% archive mode)
journal = "triecache" # Disk journal directory for trie cache to survive node restarts
rejournal = "1h0m0s" # Time interval to regenerate the trie cache journal
noprefetch = false # Disable heuristic state prefetch during block import (less CPU and disk IO, more time waiting for data) noprefetch = false # Disable heuristic state prefetch during block import (less CPU and disk IO, more time waiting for data)
preimages = false # Enable recording the SHA3/keccak preimages of trie keys preimages = false # Enable recording the SHA3/keccak preimages of trie keys
txlookuplimit = 2350000 # Number of recent blocks to maintain transactions index for (default = about 56 days, 0 = entire chain) txlookuplimit = 2350000 # Number of recent blocks to maintain transactions index for (default = about 56 days, 0 = entire chain)

1
internal/cli/dumpconfig.go
View file

@ -64,7 +64,6 @@ func (c *DumpconfigCommand) Run(args []string) int {
userConfig.Sealer.RecommitRaw = userConfig.Sealer.Recommit.String() userConfig.Sealer.RecommitRaw = userConfig.Sealer.Recommit.String()
userConfig.Gpo.MaxPriceRaw = userConfig.Gpo.MaxPrice.String() userConfig.Gpo.MaxPriceRaw = userConfig.Gpo.MaxPrice.String()
userConfig.Gpo.IgnorePriceRaw = userConfig.Gpo.IgnorePrice.String() userConfig.Gpo.IgnorePriceRaw = userConfig.Gpo.IgnorePrice.String()
userConfig.Cache.RejournalRaw = userConfig.Cache.Rejournal.String()
userConfig.Cache.TrieTimeoutRaw = userConfig.Cache.TrieTimeout.String() userConfig.Cache.TrieTimeoutRaw = userConfig.Cache.TrieTimeout.String()
userConfig.P2P.TxArrivalWaitRaw = userConfig.P2P.TxArrivalWait.String() userConfig.P2P.TxArrivalWaitRaw = userConfig.P2P.TxArrivalWait.String()

10
internal/cli/server/config.go
View file

@ -526,13 +526,6 @@ type CacheConfig struct {
// PercTrie is percentage of cache used for the trie // PercTrie is percentage of cache used for the trie
PercTrie uint64 `hcl:"trie,optional" toml:"trie,optional"` PercTrie uint64 `hcl:"trie,optional" toml:"trie,optional"`
// Journal is the disk journal directory for trie cache to survive node restarts
Journal string `hcl:"journal,optional" toml:"journal,optional"`
// Rejournal is the time interval to regenerate the journal for clean cache
Rejournal time.Duration `hcl:"-,optional" toml:"-"`
RejournalRaw string `hcl:"rejournal,optional" toml:"rejournal,optional"`
// NoPrefetch is used to disable prefetch of tries // NoPrefetch is used to disable prefetch of tries
NoPrefetch bool `hcl:"noprefetch,optional" toml:"noprefetch,optional"` NoPrefetch bool `hcl:"noprefetch,optional" toml:"noprefetch,optional"`
@ -742,8 +735,6 @@ func DefaultConfig() *Config {
PercTrie: 15, PercTrie: 15,
PercGc: 25, PercGc: 25,
PercSnapshot: 10, PercSnapshot: 10,
Journal: "triecache",
Rejournal: 60 * time.Minute,
NoPrefetch: false, NoPrefetch: false,
Preimages: false, Preimages: false,
TxLookupLimit: 2350000, TxLookupLimit: 2350000,
@ -840,7 +831,6 @@ func (c *Config) fillTimeDurations() error {
{"jsonrpc.http.ep-requesttimeout", &c.JsonRPC.Http.ExecutionPoolRequestTimeout, &c.JsonRPC.Http.ExecutionPoolRequestTimeoutRaw}, {"jsonrpc.http.ep-requesttimeout", &c.JsonRPC.Http.ExecutionPoolRequestTimeout, &c.JsonRPC.Http.ExecutionPoolRequestTimeoutRaw},
{"txpool.lifetime", &c.TxPool.LifeTime, &c.TxPool.LifeTimeRaw}, {"txpool.lifetime", &c.TxPool.LifeTime, &c.TxPool.LifeTimeRaw},
{"txpool.rejournal", &c.TxPool.Rejournal, &c.TxPool.RejournalRaw}, {"txpool.rejournal", &c.TxPool.Rejournal, &c.TxPool.RejournalRaw},
{"cache.rejournal", &c.Cache.Rejournal, &c.Cache.RejournalRaw},
{"cache.timeout", &c.Cache.TrieTimeout, &c.Cache.TrieTimeoutRaw}, {"cache.timeout", &c.Cache.TrieTimeout, &c.Cache.TrieTimeoutRaw},
{"p2p.txarrivalwait", &c.P2P.TxArrivalWait, &c.P2P.TxArrivalWaitRaw}, {"p2p.txarrivalwait", &c.P2P.TxArrivalWait, &c.P2P.TxArrivalWaitRaw},
} }

14
internal/cli/server/flags.go
View file

@ -389,20 +389,6 @@ func (c *Command) Flags(config *Config) *flagset.Flagset {
Default: c.cliConfig.Cache.PercTrie, Default: c.cliConfig.Cache.PercTrie,
Group: "Cache", Group: "Cache",
}) })
f.StringFlag(&flagset.StringFlag{
Name: "cache.trie.journal",
Usage: "Disk journal directory for trie cache to survive node restarts",
Value: &c.cliConfig.Cache.Journal,
Default: c.cliConfig.Cache.Journal,
Group: "Cache",
})
f.DurationFlag(&flagset.DurationFlag{
Name: "cache.trie.rejournal",
Usage: "Time interval to regenerate the trie cache journal",
Value: &c.cliConfig.Cache.Rejournal,
Default: c.cliConfig.Cache.Rejournal,
Group: "Cache",
})
f.Uint64Flag(&flagset.Uint64Flag{ f.Uint64Flag(&flagset.Uint64Flag{
Name: "cache.gc", Name: "cache.gc",
Usage: "Percentage of cache memory allowance to use for trie pruning", Usage: "Percentage of cache memory allowance to use for trie pruning",

2
packaging/templates/mainnet-v1/archive/config.toml
View file

@ -144,8 +144,6 @@ gcmode = "archive"
snapshot = 20 snapshot = 20
# database = 50 # database = 50
trie = 30 trie = 30
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml
View file

@ -144,8 +144,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/mainnet-v1/sentry/validator/bor/config.toml
View file

@ -146,8 +146,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/mainnet-v1/without-sentry/bor/config.toml
View file

@ -146,8 +146,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/testnet-v4/archive/config.toml
View file

@ -144,8 +144,6 @@ gcmode = "archive"
snapshot = 20 snapshot = 20
# database = 50 # database = 50
trie = 30 trie = 30
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/testnet-v4/sentry/sentry/bor/config.toml
View file

@ -144,8 +144,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/testnet-v4/sentry/validator/bor/config.toml
View file

@ -146,8 +146,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000

2
packaging/templates/testnet-v4/without-sentry/bor/config.toml
View file

@ -146,8 +146,6 @@ syncmode = "full"
# snapshot = 10 # snapshot = 10
# database = 50 # database = 50
# trie = 15 # trie = 15
# journal = "triecache"
# rejournal = "1h0m0s"
# noprefetch = false # noprefetch = false
# preimages = false # preimages = false
# txlookuplimit = 2350000 # txlookuplimit = 2350000