forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core, light: add unlock before Reset to avoid double lock

Browse source
This commit is contained in:
BurtonQin 2020-02-12 17:16:49 +08:00
parent 34bb132b10
commit 1d7ee903e5
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/blockchain.go
View file

@ -329,6 +329,8 @@ func (bc *BlockChain) loadLastState() error {
if head == (common.Hash{}) { if head == (common.Hash{}) {
// Corrupt or empty database, init from scratch // Corrupt or empty database, init from scratch
log.Warn("Empty database, resetting chain") log.Warn("Empty database, resetting chain")
bc.chainmu.Unlock()
defer bc.chainmu.Lock()
return bc.Reset() return bc.Reset()
} }
// Make sure the entire head block is available // Make sure the entire head block is available
@ -336,6 +338,8 @@ func (bc *BlockChain) loadLastState() error {
if currentBlock == nil { if currentBlock == nil {
// Corrupt or empty database, init from scratch // Corrupt or empty database, init from scratch
log.Warn("Head block missing, resetting chain", "hash", head) log.Warn("Head block missing, resetting chain", "hash", head)
bc.chainmu.Unlock()
defer bc.chainmu.Lock()
return bc.Reset() return bc.Reset()
} }
// Make sure the state associated with the block is available // Make sure the state associated with the block is available

2
light/lightchain.go
View file

@ -153,7 +153,9 @@ func (lc *LightChain) HeaderChain() *core.HeaderChain {
func (lc *LightChain) loadLastState() error { func (lc *LightChain) loadLastState() error {
if head := rawdb.ReadHeadHeaderHash(lc.chainDb); head == (common.Hash{}) { if head := rawdb.ReadHeadHeaderHash(lc.chainDb); head == (common.Hash{}) {
// Corrupt or empty database, init from scratch // Corrupt or empty database, init from scratch
lc.chainmu.Unlock()
lc.Reset() lc.Reset()
lc.chainmu.Lock()
} else { } else {
if header := lc.GetHeaderByHash(head); header != nil { if header := lc.GetHeaderByHash(head); header != nil {
lc.hc.SetCurrentHeader(header) lc.hc.SetCurrentHeader(header)