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

storagemgr: Cleanup workerLk around worker resources

Browse Source
This commit is contained in:
Łukasz Magiera 2021-09-15 15:34:50 +02:00
parent aab42dd96f
commit ef03314c6d
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,12 +78,12 @@ type workerHandle struct {
info storiface.WorkerInfo info storiface.WorkerInfo
preparing *activeResources preparing *activeResources // use with workerHandle.lk
active *activeResources active *activeResources // use with workerHandle.lk
lk sync.Mutex lk sync.Mutex // can be taken inside sched.workersLk.RLock
wndLk sync.Mutex wndLk sync.Mutex // can be taken inside sched.workersLk.RLock
activeWindows []*schedWindow activeWindows []*schedWindow
enabled bool enabled bool

12
extern/sector-storage/sched_worker.go vendored
View File

@ -399,13 +399,11 @@ func (sw *schedWorker) startProcessingTask(taskDone chan struct{}, req *workerRe
go func() { go func() {
// first run the prepare step (e.g. fetching sector data from other worker) // first run the prepare step (e.g. fetching sector data from other worker)
err := req.prepare(req.ctx, sh.workTracker.worker(sw.wid, w.info, w.workerRpc)) err := req.prepare(req.ctx, sh.workTracker.worker(sw.wid, w.info, w.workerRpc))
sh.workersLk.Lock() w.lk.Lock()
if err != nil { if err != nil {
w.lk.Lock()
w.preparing.free(w.info.Resources, needRes) w.preparing.free(w.info.Resources, needRes)
w.lk.Unlock() w.lk.Unlock()
sh.workersLk.Unlock()
select { select {
case taskDone <- struct{}{}: case taskDone <- struct{}{}:
@ -424,12 +422,10 @@ func (sw *schedWorker) startProcessingTask(taskDone chan struct{}, req *workerRe
} }
// wait (if needed) for resources in the 'active' window // wait (if needed) for resources in the 'active' window
err = w.active.withResources(sw.wid, w.info, needRes, &sh.workersLk, func() error { err = w.active.withResources(sw.wid, w.info, needRes, &w.lk, func() error {
w.lk.Lock()
w.preparing.free(w.info.Resources, needRes) w.preparing.free(w.info.Resources, needRes)
w.lk.Unlock() w.lk.Unlock()
sh.workersLk.Unlock() defer w.lk.Lock() // we MUST return locked from this function
defer sh.workersLk.Lock() // we MUST return locked from this function
select { select {
case taskDone <- struct{}{}: case taskDone <- struct{}{}:
@ -450,7 +446,7 @@ func (sw *schedWorker) startProcessingTask(taskDone chan struct{}, req *workerRe
return nil return nil
}) })
sh.workersLk.Unlock() w.lk.Unlock()
// This error should always be nil, since nothing is setting it, but just to be safe: // This error should always be nil, since nothing is setting it, but just to be safe:
if err != nil { if err != nil {

2
extern/sector-storage/stats.go vendored
View File

@ -15,6 +15,7 @@ func (m *Manager) WorkerStats() map[uuid.UUID]storiface.WorkerStats {
out := map[uuid.UUID]storiface.WorkerStats{} out := map[uuid.UUID]storiface.WorkerStats{}
for id, handle := range m.sched.workers { for id, handle := range m.sched.workers {
handle.lk.Lock()
out[uuid.UUID(id)] = storiface.WorkerStats{ out[uuid.UUID(id)] = storiface.WorkerStats{
Info: handle.info, Info: handle.info,
Enabled: handle.enabled, Enabled: handle.enabled,
@ -24,6 +25,7 @@ func (m *Manager) WorkerStats() map[uuid.UUID]storiface.WorkerStats {
GpuUsed: handle.active.gpuUsed, GpuUsed: handle.active.gpuUsed,
CpuUse: handle.active.cpuUse, CpuUse: handle.active.cpuUse,
} }
handle.lk.Unlock()
} }
return out return out