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

fix race in protectView

Browse Source
This commit is contained in:
vyzo 2022-01-31 12:40:26 +02:00
parent 1900c907fd
commit ee63be26a1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blockstore/splitstore/splitstore.go
View File

@ -494,7 +494,7 @@ func (s *SplitStore) View(ctx context.Context, cid cid.Cid, cb func([]byte) erro
} }
// critical section // critical section
s.txnLk.RLock() s.txnLk.RLock() // the lock is released in protectView if we are not in critical section
if s.txnMarkSet != nil { if s.txnMarkSet != nil {
has, err := s.txnMarkSet.Has(cid) has, err := s.txnMarkSet.Has(cid)
s.txnLk.RUnlock() s.txnLk.RUnlock()
@ -509,7 +509,6 @@ func (s *SplitStore) View(ctx context.Context, cid cid.Cid, cb func([]byte) erro
return s.cold.View(ctx, cid, cb) return s.cold.View(ctx, cid, cb)
} }
s.txnLk.RUnlock()
// views are (optimistically) protected two-fold: // views are (optimistically) protected two-fold:
// - if there is an active transaction, then the reference is protected. // - if there is an active transaction, then the reference is protected.

2
blockstore/splitstore/splitstore_compact.go
View File

@ -156,7 +156,7 @@ func (s *SplitStore) protectTipSets(apply []*types.TipSet) {
// transactionally protect a view // transactionally protect a view
func (s *SplitStore) protectView(c cid.Cid) { func (s *SplitStore) protectView(c cid.Cid) {
s.txnLk.RLock() // the txnLk is held for read
defer s.txnLk.RUnlock() defer s.txnLk.RUnlock()
if s.txnActive { if s.txnActive {