YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-06-07 22:31:55 +00:00
Code Issues Releases Wiki Activity

update fair

Browse Source
This commit is contained in:
Newnius 2020-05-28 13:21:29 +08:00
parent 636036f27f
commit f43f4e24ad
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/scheduler_fair.go
View File

@ -87,7 +87,7 @@ 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 { if quota, ok := scheduler.queuesQuota[queue]; !ok || quota.NumberGPU/100 < numberGPUtmp {
continue continue
} }
if bestQueue == "" || numberGPUtmp < numberGPU || (numberGPUtmp == numberGPU) { if bestQueue == "" || numberGPUtmp < numberGPU || (numberGPUtmp == numberGPU) {
@ -120,8 +120,8 @@ func (scheduler *SchedulerFair) Start() {
log.Info("Before, ", scheduler.queuesQuota[bestQueue]) log.Info("Before, ", scheduler.queuesQuota[bestQueue])
if quota, ok := scheduler.queuesQuota[bestQueue]; ok { if quota, ok := scheduler.queuesQuota[bestQueue]; ok {
quota.NumberGPU -= numberGPUtmp quota.NumberGPU -= numberGPUtmp * 100
quota.CPU -= numberCPUtmp quota.CPU -= numberCPUtmp * 100
} }
log.Info("After, ", scheduler.queuesQuota[bestQueue]) log.Info("After, ", scheduler.queuesQuota[bestQueue])
@ -313,7 +313,7 @@ func (scheduler *SchedulerFair) UpdateQuota() {
pool := InstanceOfResourcePool() pool := InstanceOfResourcePool()
available := pool.TotalGPU - usingGPU - allocatedGPU available := pool.TotalGPU - usingGPU - allocatedGPU/100
/* <0 means some nodes exited */ /* <0 means some nodes exited */
if available <= 0 { if available <= 0 {
return return
@ -326,6 +326,7 @@ func (scheduler *SchedulerFair) UpdateQuota() {
log.Info("CPU:", quota.CPU) log.Info("CPU:", quota.CPU)
log.Info("Memory:", quota.Memory) log.Info("Memory:", quota.Memory)
} }
available *= 100
per := available / len(scheduler.queues) per := available / len(scheduler.queues)
for queue := range scheduler.queues { for queue := range scheduler.queues {
if _, ok := scheduler.queuesQuota[queue]; !ok { if _, ok := scheduler.queuesQuota[queue]; !ok {