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

feat: mempool: reintroduce ForEachPendingMessage

Browse Source
This commit is contained in:
Aayush 2023-05-05 13:51:09 -04:00
parent 92dcfe530b
commit fb228ebbff
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chain/messagepool/messagepool.go
View File

@ -448,12 +448,8 @@ func New(ctx context.Context, api Provider, ds dtypes.MetadataDS, us stmgr.Upgra
return mp, nil return mp, nil
} }
func (mp *MessagePool) TryForEachPendingMessage(f func(cid.Cid) error) error { func (mp *MessagePool) ForEachPendingMessage(f func(cid.Cid) error) error {
// avoid deadlocks in splitstore compaction when something else needs to access the blockstore mp.lk.Lock()
// while holding the mpool lock
if !mp.lk.TryLock() {
return xerrors.Errorf("mpool TryForEachPendingMessage: could not acquire lock")
}
defer mp.lk.Unlock() defer mp.lk.Unlock()
for _, mset := range mp.pending { for _, mset := range mp.pending {

2
node/modules/chain.go
View File

@ -70,7 +70,7 @@ func MessagePool(lc fx.Lifecycle, mctx helpers.MetricsCtx, us stmgr.UpgradeSched
return mp.Close() return mp.Close()
}, },
}) })
protector.AddProtector(mp.TryForEachPendingMessage) protector.AddProtector(mp.ForEachPendingMessage)
return mp, nil return mp, nil
} }