Merge pull request #10811 from filecoin-project/fix/no-yielding-with-txnlock

fix:splitstore:Don't block when potentially holding txnLk as writer
This commit is contained in:
ZenGround0 2023-05-03 12:07:20 -04:00 committed by GitHub
commit a3a429edad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -455,7 +455,7 @@ func (s *SplitStore) protectTxnRefs(markSet MarkSet) error {
// transactionally protect a reference by walking the object and marking. // transactionally protect a reference by walking the object and marking.
// concurrent markings are short circuited by checking the markset. // concurrent markings are short circuited by checking the markset.
func (s *SplitStore) doTxnProtect(root cid.Cid, markSet MarkSet) (int64, error) { func (s *SplitStore) doTxnProtect(root cid.Cid, markSet MarkSet) (int64, error) {
if err := s.checkYield(); err != nil { if err := s.checkClosing(); err != nil {
return 0, err return 0, err
} }