Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core, trie: intermediate mempool between trie and database #15857

Merged
merged 33 commits into from
Feb 5, 2018
Merged

core, trie: intermediate mempool between trie and database #15857

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
33cca2b
core, trie: intermediate mempool between trie and database
karalabe Jan 11, 2018
0e91a17
core, trie: commit trie mempool on close, fix dao test
karalabe Jan 11, 2018
d2ec96e
core, trie: minor cleanups, test fixes
karalabe Jan 12, 2018
34d766a
core, trie: finalize the new trie node-caching db layer
karalabe Jan 17, 2018
80eb5be
core, trie: thread-safe triedb commit, configurable caches
karalabe Jan 17, 2018
e065755
core, trie: fix some dereferencing issues
karalabe Jan 18, 2018
bb40af2
trie: make databse more Go GC friendly
karalabe Jan 19, 2018
be674fa
cmd, core, eth: support restarting with missing states
karalabe Jan 19, 2018
c03e94c
core: garbage collect side fork tries too
karalabe Jan 22, 2018
b46b291
core: only store pruned sidechains until they beat canonical
karalabe Jan 24, 2018
4315480
core, trie: fix duplicate references, sanity check on shutdown
karalabe Jan 24, 2018
b2d8f14
trie: fix the double reference fix (i.e. roots *can* be double refed)
karalabe Jan 24, 2018
507f20d
core: make trie critical periods verbose, add failsafes
karalabe Jan 25, 2018
f0db662
eth: switch hacky tracer pruning to triedb garbage collector
karalabe Jan 25, 2018
a3cd57e
core, trie: fix all the linters
karalabe Jan 25, 2018
7dc1f18
core: add current cache size to import logs
karalabe Jan 25, 2018
615145e
trie: count preimages in memuse, commit in KB batches
karalabe Jan 26, 2018
cfb510c
core: only count canonical blocks for GC processing time
karalabe Jan 26, 2018
abd9983
eth/dwonloader: moving pivot and capped memory usage
karalabe Jan 30, 2018
a7bae8c
trie: use batch reset instead of recreation
karalabe Jan 30, 2018
a2b7866
core, les, light, trie: correctly use the memdb for tries
karalabe Jan 31, 2018
20369b0
eth/downloader: reduce a log level back to debug
karalabe Jan 31, 2018
a14bfec
light: make the trie mempool play nice with CHTs
karalabe Jan 31, 2018
a4cff48
core: warn the user that we're saving state on shutdown
karalabe Feb 1, 2018
4aeed07
core: report pretty storage sizes for receipt inserts
karalabe Feb 1, 2018
92716dd
eth/downloader: termiante state sync cleanly
karalabe Feb 1, 2018
87a37c3
core: make receipt and headers have the same log format
karalabe Feb 1, 2018
104ccf5
core, eth, les, light: hide triedb behind state database
karalabe Feb 2, 2018
3c30b28
core: remote a debugging warning log
karalabe Feb 2, 2018
5f253f6
eth/downloader: fix statesync fast restart race, hang test
karalabe Feb 2, 2018
30ddc90
cmd: drop trie cache timeout flag (available via config)
karalabe Feb 2, 2018
49bdc8b
core, eth: avoid RLP serialization in downloader queue
karalabe Feb 2, 2018
54b8ded
cmd, core, eth, light, trie: gcmode flag + supress archive logs
karalabe Feb 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cmd: drop trie cache timeout flag (available via config)
  • Loading branch information
@karalabe
karalabe committed Feb 5, 2018
commit 30ddc903c2616fcd5f7209460aaa716ca94aae07
1 change: 0 additions & 1 deletion cmd/geth/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ var (
utils.CacheFlag,
utils.CacheDatabaseFlag,
utils.CacheGCFlag,
utils.CacheGCTimeoutFlag,
utils.TrieCacheGenFlag,
utils.ListenPortFlag,
utils.MaxPeersFlag,
Expand Down
1 change: 0 additions & 1 deletion cmd/geth/usage.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ var AppHelpFlagGroups = []flagGroup{
utils.CacheFlag,
utils.CacheDatabaseFlag,
utils.CacheGCFlag,
utils.CacheGCTimeoutFlag,
utils.TrieCacheGenFlag,
},
},
Expand Down
12 changes: 0 additions & 12 deletions cmd/utils/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"runtime"
"strconv"
"strings"
"time"

"github.com/ethereum/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore"
Expand Down Expand Up @@ -307,11 +306,6 @@ var (
Usage: "Percentage of cache memory allowance to use for trie pruning",
Value: 25,
}
CacheGCTimeoutFlag = cli.DurationFlag{
Name: "cache.gc.timeout",
Usage: "Maximum time after which to flush memory-only tries to disk",
Value: 5 * time.Minute,
}
TrieCacheGenFlag = cli.IntFlag{
Name: "trie-cache-gens",
Usage: "Number of trie node generations to keep in memory",
Expand Down Expand Up @@ -1045,9 +1039,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheGCFlag.Name) {
cfg.TrieCache = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheGCFlag.Name) / 100
}
if ctx.GlobalIsSet(CacheGCTimeoutFlag.Name) {
cfg.TrieTimeout = ctx.GlobalDuration(CacheGCTimeoutFlag.Name)
}
if ctx.GlobalIsSet(MinerThreadsFlag.Name) {
cfg.MinerThreads = ctx.GlobalInt(MinerThreadsFlag.Name)
}
Expand Down Expand Up @@ -1238,9 +1229,6 @@ func MakeChain(ctx *cli.Context, stack *node.Node) (chain *core.BlockChain, chai
if ctx.GlobalIsSet(CacheFlag.Name) || ctx.GlobalIsSet(CacheGCFlag.Name) {
cache.TrieNodeLimit = ctx.GlobalInt(CacheFlag.Name) * ctx.GlobalInt(CacheGCFlag.Name) / 100
}
if ctx.GlobalIsSet(CacheGCTimeoutFlag.Name) {
cache.TrieTimeLimit = ctx.GlobalDuration(CacheGCTimeoutFlag.Name)
}
vmcfg := vm.Config{EnablePreimageRecording: ctx.GlobalBool(VMEnableDebugFlag.Name)}
chain, err = core.NewBlockChain(chainDb, cache, config, engine, vmcfg)
if err != nil {
Expand Down