YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-15 08:16:43 +00:00
Code Issues Releases Wiki Activity

update fair

Browse Source
This commit is contained in:
Newnius
2020-05-28 10:59:20 +08:00
parent e618b0894e
commit a195e7b543
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/job_manager.go
View File

@@ -197,9 +197,11 @@ func (jm *JobManager) checkStatus(status []TaskStatus) {
jm.scheduler.UpdateProgress(jm.job, Failed) jm.scheduler.UpdateProgress(jm.job, Failed)
} }
jm.scheduler.ReleaseResource(jm.job, jm.resources[i]) if jm.resources[i].ClientID != "_released_" {
log.Info("return resource ", jm.resources[i].ClientID) jm.scheduler.ReleaseResource(jm.job, jm.resources[i])
jm.resources[i].ClientID = "_released_" log.Info("return resource ", jm.resources[i].ClientID)
jm.resources[i].ClientID = "_released_"
}
for _, t := range jm.resources[i].Status { for _, t := range jm.resources[i].Status {
InstanceOfResourcePool().detach(t.UUID, jm.job) InstanceOfResourcePool().detach(t.UUID, jm.job)

7
src/scheduler_fair.go
View File

@@ -277,6 +277,9 @@ func (scheduler *SchedulerFair) AcquireResource(job Job) []NodeStatus {
}(res) }(res)
} }
go func() {
scheduler.UpdateQuota()
}()
return res return res
} }
@@ -296,7 +299,9 @@ func (scheduler *SchedulerFair) ReleaseResource(job Job, agent NodeStatus) {
} }
scheduler.resourceAllocationsMu.Unlock() scheduler.resourceAllocationsMu.Unlock()
}(agent) }(agent)
scheduler.UpdateQuota() go func() {
scheduler.UpdateQuota()
}()
} }
/* allocate quota to queues */ /* allocate quota to queues */