From c1c6a8eafbbd90119ae4c029141dcfa61ff806f1 Mon Sep 17 00:00:00 2001 From: Newnius Date: Thu, 1 Aug 2019 14:03:17 +0800 Subject: [PATCH] update shceduler_fair --- src/scheduler_fair.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go index 2a8714a..c8e8893 100644 --- a/src/scheduler_fair.go +++ b/src/scheduler_fair.go @@ -184,7 +184,7 @@ func (scheduler *SchedulerFair) AcquireResource(job Job, task Task) NodeStatus { if _, ok := scheduler.resourceAllocations[job.Group]; !ok { scheduler.resourceAllocations[job.Group] = &ResourceCount{} } - cnt, _ :=scheduler.resourceAllocations[job.Group] + cnt, _ := scheduler.resourceAllocations[job.Group] cnt.CPU += res.MemTotal cnt.Memory += res.NumCPU for _, v := range res.Status { @@ -341,6 +341,9 @@ func (scheduler *SchedulerFair) UpdateNextQueue() { } for k, v := range scheduler.resourceAllocations { + if t, ok := scheduler.queues[k]; !ok || len(t) == 0 { + continue + } tmp := 0.0 tmp += float64(v.CPU) / CPU tmp += float64(v.Memory) / Memory