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

sealing sched: Fix deadlock between worker.wndLk / workersLk

Browse Source
This commit is contained in:
Łukasz Magiera 2020-09-02 16:40:43 +02:00
parent b7f2487c4f
commit 7fe8580da5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extern/sector-storage/sched.go vendored
View File

@ -563,6 +563,7 @@ func (sh *scheduler) runWorker(wid WorkerID) {
return return
} }
sh.workersLk.RLock()
worker.wndLk.Lock() worker.wndLk.Lock()
windowsRequested -= sh.workerCompactWindows(worker, wid) windowsRequested -= sh.workerCompactWindows(worker, wid)
@ -574,8 +575,6 @@ func (sh *scheduler) runWorker(wid WorkerID) {
// process tasks within a window, preferring tasks at lower indexes // process tasks within a window, preferring tasks at lower indexes
for len(firstWindow.todo) > 0 { for len(firstWindow.todo) > 0 {
sh.workersLk.RLock()
tidx := -1 tidx := -1
worker.lk.Lock() worker.lk.Lock()
@ -589,7 +588,6 @@ func (sh *scheduler) runWorker(wid WorkerID) {
worker.lk.Unlock() worker.lk.Unlock()
if tidx == -1 { if tidx == -1 {
sh.workersLk.RUnlock()
break assignLoop break assignLoop
} }
@ -597,7 +595,6 @@ func (sh *scheduler) runWorker(wid WorkerID) {
log.Debugf("assign worker sector %d", todo.sector.Number) log.Debugf("assign worker sector %d", todo.sector.Number)
err := sh.assignWorker(taskDone, wid, worker, todo) err := sh.assignWorker(taskDone, wid, worker, todo)
sh.workersLk.RUnlock()
if err != nil { if err != nil {
log.Error("assignWorker error: %+v", err) log.Error("assignWorker error: %+v", err)
@ -618,6 +615,7 @@ func (sh *scheduler) runWorker(wid WorkerID) {
} }
worker.wndLk.Unlock() worker.wndLk.Unlock()
sh.workersLk.RUnlock()
} }
}() }()
} }