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

fix: revert chain sync mutex to a regular lock

Browse Source 
Conditions always call "unlock" so we can't safely use the condition
with both the read and write side of lock. So we might as well revert
back to a regular lock.

fixes #10616
This commit is contained in:
Steven Allen 2023-04-04 11:15:21 -07:00 committed by Phi
parent d77ac5ddcb
commit 34f46d736f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockstore/splitstore/splitstore.go
View File

@ -188,7 +188,7 @@ type SplitStore struct {
cancel func() cancel func()
outOfSync int32 // for fast checking outOfSync int32 // for fast checking
chainSyncMx sync.RWMutex chainSyncMx sync.Mutex
chainSyncCond sync.Cond chainSyncCond sync.Cond
chainSyncFinished bool // protected by chainSyncMx chainSyncFinished bool // protected by chainSyncMx

4
blockstore/splitstore/splitstore_compact.go
View File

@ -917,8 +917,8 @@ func (s *SplitStore) waitForSync() {
if atomic.LoadInt32(&s.outOfSync) == 0 { if atomic.LoadInt32(&s.outOfSync) == 0 {
return return
} }
s.chainSyncMx.RLock() s.chainSyncMx.Lock()
defer s.chainSyncMx.RUnlock() defer s.chainSyncMx.Unlock()
for !s.chainSyncFinished { for !s.chainSyncFinished {
s.chainSyncCond.Wait() s.chainSyncCond.Wait()