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

avoid races in beginCriticalSection

Browse Source
This commit is contained in:
vyzo 2022-01-31 18:47:08 +02:00
parent 710fda49f0
commit 5b9ea1b4e0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blockstore/splitstore/splitstore_compact.go
View File

@ -711,6 +711,11 @@ func (s *SplitStore) beginTxnProtect() {
func (s *SplitStore) beginCriticalSection(markSet MarkSet) error { func (s *SplitStore) beginCriticalSection(markSet MarkSet) error {
log.Info("beginning critical section") log.Info("beginning critical section")
// do that once first to get the bulk before the markset is in critical section
if err := s.protectTxnRefs(markSet); err != nil {
return xerrors.Errorf("error protecting transactional references: %w", err)
}
if err := markSet.BeginCriticalSection(); err != nil { if err := markSet.BeginCriticalSection(); err != nil {
return xerrors.Errorf("error beginning critical section for markset: %w", err) return xerrors.Errorf("error beginning critical section for markset: %w", err)
} }
@ -719,6 +724,7 @@ func (s *SplitStore) beginCriticalSection(markSet MarkSet) error {
s.txnMarkSet = markSet s.txnMarkSet = markSet
s.txnLk.Unlock() s.txnLk.Unlock()
// and do it again to mark references that might have been created in the meantime
if err := s.protectTxnRefs(markSet); err != nil { if err := s.protectTxnRefs(markSet); err != nil {
return xerrors.Errorf("error protecting transactional references: %w", err) return xerrors.Errorf("error protecting transactional references: %w", err)
} }