1
0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-06-07 14:21:55 +00:00

update fair

This commit is contained in:
Newnius 2020-05-28 10:45:33 +08:00
parent 618206b7d5
commit b22cf6f680

View File

@ -91,10 +91,10 @@ func (scheduler *SchedulerFair) Start() {
numberGPUtmp += task.NumberGPU numberGPUtmp += task.NumberGPU
numberCPUtmp += task.NumberCPU numberCPUtmp += task.NumberCPU
} }
if quota, ok := scheduler.queuesQuota[queue]; !ok || quota.NumberGPU < numberGPUtmp || quota.CPU < numberCPUtmp { if quota, ok := scheduler.queuesQuota[queue]; !ok || quota.NumberGPU < numberGPUtmp {
continue continue
} }
if bestQueue == "" || numberGPUtmp < numberGPU || (numberGPUtmp == numberGPU && numberCPUtmp < numberCPU) { if bestQueue == "" || numberGPUtmp < numberGPU || (numberGPUtmp == numberGPU) {
bestQueue = queue bestQueue = queue
numberGPU = numberGPUtmp numberGPU = numberGPUtmp
numberCPU = numberCPUtmp numberCPU = numberCPUtmp
@ -309,6 +309,7 @@ func (scheduler *SchedulerFair) UpdateQuota() {
defer scheduler.quotaMu.Unlock() defer scheduler.quotaMu.Unlock()
log.Info("Updating queues quota~") log.Info("Updating queues quota~")
/* phase 1: DRF */
usingGPU := 0 usingGPU := 0
allocatedGPU := 0 allocatedGPU := 0
scheduler.resourceAllocationsMu.Lock() scheduler.resourceAllocationsMu.Lock()
@ -355,6 +356,8 @@ func (scheduler *SchedulerFair) UpdateQuota() {
log.Info("CPU:", quota.CPU) log.Info("CPU:", quota.CPU)
log.Info("Memory:", quota.Memory) log.Info("Memory:", quota.Memory)
} }
/* Phase 2: return */
} }
func (scheduler *SchedulerFair) QueryState(jobName string) MsgJobStatus { func (scheduler *SchedulerFair) QueryState(jobName string) MsgJobStatus {