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

wait for sync in a non racey way

Browse Source
This commit is contained in:
vyzo 2022-02-01 11:10:51 +02:00
parent 578b5691bc
commit 7b4ab2077b
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blockstore/splitstore/splitstore.go
View File

@ -157,6 +157,9 @@ type SplitStore struct {
txnRefs map[cid.Cid]struct{}
txnMissing map[cid.Cid]struct{}
txnMarkSet MarkSet
txnSyncMx sync.Mutex
txnSyncCond sync.Cond
txnSync bool
// registered protectors
protectors []func(func(cid.Cid) error) error
@ -196,6 +199,7 @@ func Open(path string, ds dstore.Datastore, hot, cold bstore.Blockstore, cfg *Co
}
ss.txnViewsCond.L = &ss.txnViewsMx
ss.txnSyncCond.L = &ss.txnSyncMx
ss.ctx, ss.cancel = context.WithCancel(context.Background())
if enableDebugLog {

23
blockstore/splitstore/splitstore_compact.go
View File

@ -162,8 +162,15 @@ func (s *SplitStore) protectTipSets(apply []*types.TipSet) {
// critical section
if s.txnMarkSet != nil {
go func() {
defer func() {
s.txnSyncMx.Lock()
defer s.txnSyncMx.Unlock()
s.txnSync = true
s.txnSyncCond.Broadcast()
}()
defer s.txnLk.RUnlock()
s.markLiveRefs(cids)
}()
return
}
@ -663,9 +670,8 @@ func (s *SplitStore) doCompact(curTs *types.TipSet) error {
return err
}
// wait for the head to catch up so that all messages in the current head are protected
log.Infof("waiting %s for sync", SyncWaitTime)
time.Sleep(SyncWaitTime)
// wait for the head to catch up so that all messages are protected
s.waitForSync()
if err := s.checkClosing(); err != nil {
return err
@ -731,6 +737,7 @@ func (s *SplitStore) beginTxnProtect() {
defer s.txnLk.Unlock()
s.txnActive = true
s.txnSync = false
s.txnRefs = make(map[cid.Cid]struct{})
s.txnMissing = make(map[cid.Cid]struct{})
}
@ -762,6 +769,15 @@ func (s *SplitStore) beginCriticalSection(markSet MarkSet) error {
return nil
}
func (s *SplitStore) waitForSync() {
s.txnSyncMx.Lock()
defer s.txnSyncMx.Unlock()
for !s.txnSync {
s.txnSyncCond.Wait()
}
}
func (s *SplitStore) endTxnProtect() {
s.txnLk.Lock()
defer s.txnLk.Unlock()
@ -771,6 +787,7 @@ func (s *SplitStore) endTxnProtect() {
}
s.txnActive = false
s.txnSync = false
s.txnRefs = nil
s.txnMissing = nil
s.txnMarkSet = nil