cerc-io/lotus
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #4872 from filecoin-project/raulk/fix-blockstore-import

Browse Source 
fix badger double open on daemon --import-snapshot; chainstore lifecycle
This commit is contained in:
Łukasz Magiera
2020-11-18 01:36:16 +01:00
committed by GitHub
parent 00335878ab 27c0ce4a3a
commit 50146fb9b9
13 changed files with 50 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node/modules/chain.go
+7 -1
View File
@@ -111,13 +111,19 @@ func SetupFallbackBlockstore(cbs dtypes.ChainBlockstore, rem dtypes.ChainBitswap
return nil
}
func ChainStore(bs dtypes.ChainBlockstore, lbs dtypes.ChainRawBlockstore, ds dtypes.MetadataDS, syscalls vm.SyscallBuilder, j journal.Journal) *store.ChainStore {
func ChainStore(lc fx.Lifecycle, bs dtypes.ChainBlockstore, lbs dtypes.ChainRawBlockstore, ds dtypes.MetadataDS, syscalls vm.SyscallBuilder, j journal.Journal) *store.ChainStore {
chain := store.NewChainStore(bs, lbs, ds, syscalls, j)
if err := chain.Load(); err != nil {
log.Warnf("loading chain state from disk: %s", err)
}
lc.Append(fx.Hook{
OnStop: func(_ context.Context) error {
return chain.Close()
},
})
return chain
}