gofmt
This commit is contained in:
parent
cb0bb31d06
commit
780596477c
14
sched.go
14
sched.go
@ -51,14 +51,14 @@ func newScheduler(spt abi.RegisteredProof) *scheduler {
|
|||||||
nextWorker: 0,
|
nextWorker: 0,
|
||||||
workers: map[WorkerID]*workerHandle{},
|
workers: map[WorkerID]*workerHandle{},
|
||||||
|
|
||||||
newWorkers: make(chan *workerHandle),
|
newWorkers: make(chan *workerHandle),
|
||||||
|
|
||||||
watchClosing: make(chan WorkerID),
|
watchClosing: make(chan WorkerID),
|
||||||
workerClosing: make(chan WorkerID),
|
workerClosing: make(chan WorkerID),
|
||||||
|
|
||||||
schedule: make(chan *workerRequest),
|
schedule: make(chan *workerRequest),
|
||||||
workerFree: make(chan WorkerID),
|
workerFree: make(chan WorkerID),
|
||||||
closing: make(chan struct{}),
|
closing: make(chan struct{}),
|
||||||
|
|
||||||
schedQueue: list.New(),
|
schedQueue: list.New(),
|
||||||
}
|
}
|
||||||
@ -394,7 +394,7 @@ func canHandleRequest(needRes Resources, spt abi.RegisteredProof, wid WorkerID,
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if active.cpuUse + uint64(needRes.Threads) > res.CPUs {
|
if active.cpuUse+uint64(needRes.Threads) > res.CPUs {
|
||||||
log.Debugf("sched: not scheduling on worker %d; not enough threads, need %d, %d in use, target %d", wid, needRes.Threads, active.cpuUse, res.CPUs)
|
log.Debugf("sched: not scheduling on worker %d; not enough threads, need %d, %d in use, target %d", wid, needRes.Threads, active.cpuUse, res.CPUs)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@ -416,12 +416,12 @@ func (a *activeResources) utilization(wr storiface.WorkerResources) float64 {
|
|||||||
cpu := float64(a.cpuUse) / float64(wr.CPUs)
|
cpu := float64(a.cpuUse) / float64(wr.CPUs)
|
||||||
max = cpu
|
max = cpu
|
||||||
|
|
||||||
memMin := float64(a.memUsedMin + wr.MemReserved) / float64(wr.MemPhysical)
|
memMin := float64(a.memUsedMin+wr.MemReserved) / float64(wr.MemPhysical)
|
||||||
if memMin > max {
|
if memMin > max {
|
||||||
max = memMin
|
max = memMin
|
||||||
}
|
}
|
||||||
|
|
||||||
memMax := float64(a.memUsedMax + wr.MemReserved) / float64(wr.MemPhysical + wr.MemSwap)
|
memMax := float64(a.memUsedMax+wr.MemReserved) / float64(wr.MemPhysical+wr.MemSwap)
|
||||||
if memMax > max {
|
if memMax > max {
|
||||||
max = memMax
|
max = memMax
|
||||||
}
|
}
|
||||||
|
@ -68,7 +68,7 @@ func (sh *scheduler) runWorkerWatcher() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cases[toSet] = reflect.SelectCase{
|
cases[toSet] = reflect.SelectCase{
|
||||||
Dir: reflect.SelectRecv,
|
Dir: reflect.SelectRecv,
|
||||||
Chan: reflect.ValueOf(workerClosing),
|
Chan: reflect.ValueOf(workerClosing),
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ func (sh *scheduler) runWorkerWatcher() {
|
|||||||
|
|
||||||
delete(caseToWorker, n)
|
delete(caseToWorker, n)
|
||||||
cases[n] = reflect.SelectCase{
|
cases[n] = reflect.SelectCase{
|
||||||
Dir: reflect.SelectRecv,
|
Dir: reflect.SelectRecv,
|
||||||
Chan: nilch,
|
Chan: nilch,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ type Remote struct {
|
|||||||
index SectorIndex
|
index SectorIndex
|
||||||
auth http.Header
|
auth http.Header
|
||||||
|
|
||||||
fetchLk sync.Mutex
|
fetchLk sync.Mutex
|
||||||
fetching map[abi.SectorID]chan struct{}
|
fetching map[abi.SectorID]chan struct{}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,7 +121,7 @@ func (r *Remote) acquireFromRemote(ctx context.Context, s abi.SectorID, fileType
|
|||||||
return "", "", "", nil, xerrors.Errorf("failed to acquire sector %v from remote(%d): not found", s, fileType)
|
return "", "", "", nil, xerrors.Errorf("failed to acquire sector %v from remote(%d): not found", s, fileType)
|
||||||
}
|
}
|
||||||
|
|
||||||
sort.Slice(si, func(i, j int) bool {
|
sort.Slice(si, func(i, j int) bool {
|
||||||
return si[i].Weight < si[j].Weight
|
return si[i].Weight < si[j].Weight
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user