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

Jump to bottom

core: improve snapshot journal recovery #21594

Merged
merged 19 commits into from
Oct 29, 2020
Merged

core: improve snapshot journal recovery #21594

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5a058de
core/state/snapshot: introduce snapshot journal version
rjl493456442 Sep 11, 2020
c0d3cce
core: update the disk layer in an atomic way
rjl493456442 Sep 14, 2020
c37009f
core: persist the disk layer generator periodically
rjl493456442 Sep 14, 2020
08bc64e
core/state/snapshot: improve logging
rjl493456442 Sep 15, 2020
abe54d9
core/state/snapshot: forcibly ensure the legacy snapshot is matched
rjl493456442 Sep 22, 2020
5b23601
core/state/snapshot: add debug logs
rjl493456442 Sep 22, 2020
d05d895
core, tests: fix tests and special recovery case
rjl493456442 Sep 22, 2020
103c3ea
core: polish
rjl493456442 Sep 23, 2020
211407e
core: add more blockchain tests for snapshot recovery
rjl493456442 Sep 23, 2020
959f393
core/state: fix comment
rjl493456442 Sep 24, 2020
84af27e
core: add recovery flag for snapshot
rjl493456442 Sep 24, 2020
95bf1a4
core: add restart after start-after-crash tests
rjl493456442 Sep 24, 2020
e6355e2
core/rawdb: fix imports
rjl493456442 Sep 24, 2020
64faa3b
core: fix tests
rjl493456442 Oct 28, 2020
6d1f63d
core: remove log
rjl493456442 Oct 28, 2020
de9e24e
core/state/snapshot: fix snapshot
rjl493456442 Oct 28, 2020
ff3dc39
core: avoid callbacks in SetHead
karalabe Oct 7, 2020
64b5566
core: fix setHead cornercase where the threshold root has state
karalabe Oct 7, 2020
3d01d79
core: small docs for the test cases
karalabe Oct 29, 2020
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
core: polish
  • Loading branch information
@rjl493456442
rjl493456442 committed Oct 28, 2020
commit 103c3ea453ace052b52a774e525ab6e3f385fa4e
5 changes: 3 additions & 2 deletions core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,14 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
if _, err := state.New(head.Root(), bc.stateCache, bc.snaps); err != nil {
// Head state is missing, before the state recovery, find out the
// disk layer point of snapshot(if it's enabled). Make sure the
// rewound point is lower then disk layer.
// rewound point is lower than disk layer.
var diskRoot common.Hash
if bc.cacheConfig.SnapshotLimit > 0 {
diskRoot = rawdb.ReadSnapshotRoot(bc.db)
recoverSnapshot = true
}
log.Warn("Head state missing, repairing", "number", head.Number(), "hash", head.Hash())
if diskRoot != (common.Hash{}) {
log.Warn("Head state missing, repairing", "number", head.Number(), "hash", head.Hash(), "snaproot", diskRoot)
var marked bool
if err := bc.SetHeadWithCondition(head.NumberU64(), func(block *types.Block, canStop *bool) {
if block.Root() == diskRoot && !marked {
Expand All @@ -300,6 +300,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par
return nil, err
}
} else {
log.Warn("Head state missing, repairing", "number", head.Number(), "hash", head.Hash())
if err := bc.SetHead(head.NumberU64()); err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions core/state/snapshot/journal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ func loadSnapshot(diskdb ethdb.KeyValueStore, triedb *trie.Database, cache int,
var legacy bool
snapshot, generator, err := loadAndParseJournal(diskdb, base)
if err != nil {
log.Debug("Failed to load latest-format journal", "error", err)
log.Debug("Failed to load new-format journal", "error", err)
snapshot, generator, err = loadAndParseLegacyJournal(diskdb, base)
legacy = true
}
Expand All @@ -182,10 +182,10 @@ func loadSnapshot(diskdb ethdb.KeyValueStore, triedb *trie.Database, cache int,
return nil, fmt.Errorf("head doesn't match snapshot: have %#x, want %#x", head, root)
}
// It's in snapshot recovery, the assumption is held that
// the disk layer is higher than chain head. It can be
// eventually recovered when the chain head is beyond the
// the disk layer is always higher than chain head. It can
// be eventually recovered when the chain head beyonds the
// disk layer.
log.Warn("Snapshot is not continous with chain", "snaproot", head, "chainroot", root)
log.Warn("Snapshot is not continous with chain, wait recovery", "snaproot", head, "chainroot", root)
}
// Everything loaded correctly, resume any suspended operations
if !generator.Done {
Expand Down