From 88fce67e4cc0e280fc1c89fd1a09fd768831a24d Mon Sep 17 00:00:00 2001 From: Newnius Date: Thu, 28 May 2020 14:48:58 +0800 Subject: [PATCH] update fair --- src/scheduler_fair.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go index e644536..90eed50 100644 --- a/src/scheduler_fair.go +++ b/src/scheduler_fair.go @@ -331,14 +331,6 @@ func (scheduler *SchedulerFair) UpdateQuota() { if availableGPU <= 0 { return } - log.Info("Can allocate ", availableGPU) - log.Info("Before ") - for queue, quota := range scheduler.queuesQuota { - log.Info("Queue<->", queue) - log.Info("GPU:", quota.NumberGPU) - log.Info("CPU:", quota.CPU) - log.Info("Memory:", quota.Memory) - } availableGPU *= 1000 availableCPU *= 1000 @@ -375,6 +367,14 @@ func (scheduler *SchedulerFair) UpdateQuota() { if len(candidates) == 0 { return } + log.Info("Can allocate ", availableGPU) + log.Info("Before ") + for queue, quota := range scheduler.queuesQuota { + log.Info("Queue<->", queue) + log.Info("GPU:", quota.NumberGPU) + log.Info("CPU:", quota.CPU) + log.Info("Memory:", quota.Memory) + } per := availableGPU / weights for _, queue := range candidates { @@ -390,6 +390,7 @@ func (scheduler *SchedulerFair) UpdateQuota() { availableCPU -= (requests[queue].CPU / requests[queue].NumberGPU) * per * weight quota.Memory += (requests[queue].Memory / requests[queue].NumberGPU) * per * weight / 1000 } + log.Info(availableGPU) if availableGPU > 0 { for _, queue := range candidates { quota := scheduler.queuesQuota[queue]