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

Merge pull request #4411 from filecoin-project/fix/slow-mpool-stortup

Browse Source 
mpool: Don't block node startup loading messages
This commit is contained in:
Łukasz Magiera 2020-10-15 03:58:36 +02:00 committed by GitHub
commit 8340124786
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
chain/messagepool/messagepool.go
View File

@ -370,11 +370,23 @@ func New(api Provider, ds dtypes.MetadataDS, netName dtypes.NetworkName, j journ
return err return err
}) })
if err := mp.loadLocal(); err != nil { mp.curTsLk.Lock()
mp.lk.Lock()
go func() {
err := mp.loadLocal()
mp.lk.Unlock()
mp.curTsLk.Unlock()
if err != nil {
log.Errorf("loading local messages: %+v", err) log.Errorf("loading local messages: %+v", err)
} }
go mp.runLoop() log.Info("mpool ready")
mp.runLoop()
}()
return mp, nil return mp, nil
} }
@ -667,9 +679,6 @@ func (mp *MessagePool) addLoaded(m *types.SignedMessage) error {
return err return err
} }
mp.curTsLk.Lock()
defer mp.curTsLk.Unlock()
curTs := mp.curTs curTs := mp.curTs
if curTs == nil { if curTs == nil {
@ -685,9 +694,6 @@ func (mp *MessagePool) addLoaded(m *types.SignedMessage) error {
return xerrors.Errorf("minimum expected nonce is %d: %w", snonce, ErrNonceTooLow) return xerrors.Errorf("minimum expected nonce is %d: %w", snonce, ErrNonceTooLow)
} }
mp.lk.Lock()
defer mp.lk.Unlock()
_, err = mp.verifyMsgBeforeAdd(m, curTs, true) _, err = mp.verifyMsgBeforeAdd(m, curTs, true)
if err != nil { if err != nil {
return err return err