YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-12 23:36:44 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Newnius
2020-05-03 00:14:08 +08:00
parent e553c332c1
commit d8c6e4c9be
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/scheduler_fair.go
View File

@@ -177,6 +177,7 @@ func (scheduler *SchedulerFair) Start() {
scheduler.schedulingMu.Lock()
scheduler.schedulingJobsCnt++
scheduler.queuesSchedulingCnt[jm.job.Group]++
scheduler.schedulingMu.Unlock()
scheduler.allocatingGPUMu.Lock()
@@ -208,7 +209,7 @@ func (scheduler *SchedulerFair) Start() {
}()
}
func (scheduler *SchedulerFair) UpdateProgress(jobName string, state State) {
func (scheduler *SchedulerFair) UpdateProgress(job Job, state State) {
scheduler.historyMu.Lock()
defer scheduler.historyMu.Unlock()
@@ -216,10 +217,13 @@ func (scheduler *SchedulerFair) UpdateProgress(jobName string, state State) {
case Running:
scheduler.schedulingMu.Lock()
scheduler.schedulingJobsCnt--
if _, ok := scheduler.queuesSchedulingCnt[job.Group]; ok {
scheduler.queuesSchedulingCnt[job.Group]--
}
scheduler.schedulingMu.Unlock()
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Running
scheduler.history[i].UpdatedAt = int(time.Now().Unix())
}
@@ -227,7 +231,7 @@ func (scheduler *SchedulerFair) UpdateProgress(jobName string, state State) {
break
case Finished:
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Finished
scheduler.history[i].UpdatedAt = int(time.Now().Unix())
}
@@ -235,7 +239,7 @@ func (scheduler *SchedulerFair) UpdateProgress(jobName string, state State) {
break
case Stopped:
for i := range scheduler.history {
if scheduler.history[i].Name == jobName {
if scheduler.history[i].Name == job.Name {
scheduler.history[i].Status = Stopped
scheduler.history[i].UpdatedAt = int(time.Now().Unix())
}
@@ -443,6 +447,7 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node
if node.Status[j].MemoryAllocated == 0 {
scheduler.UsingGPUMu.Lock()
scheduler.UsingGPU ++
scheduler.queueUsingGPU[job.Group] += task.NumberGPU
scheduler.UsingGPUMu.Unlock()
}
node.Status[j].MemoryAllocated += task.MemoryGPU
@@ -462,6 +467,7 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task, nodes []Node
for i := range locks {
pool.poolsMu[i].Unlock()
}
go func(res NodeStatus) {
if len(res.Status) == 0 {
return
@@ -502,6 +508,12 @@ func (scheduler *SchedulerFair) ReleaseResource(job Job, agent NodeStatus) {
if node.Status[j].MemoryAllocated == 0 {
scheduler.UsingGPUMu.Lock()
scheduler.UsingGPU--
if _, ok := scheduler.queueUsingGPU[job.Group]; ok {
scheduler.queueUsingGPU[job.Group]--
if scheduler.queueUsingGPU[job.Group] < 0 {
scheduler.queueUsingGPU[job.Group] = 0
}
}
scheduler.UsingGPUMu.Unlock()
log.Info(node.Status[j].UUID, " is released")
}