From 3f215b0e1d0334e910e92e60fcf26e18d2df3a8b Mon Sep 17 00:00:00 2001 From: Newnius Date: Mon, 13 Apr 2020 18:37:54 +0800 Subject: [PATCH] bugfix --- src/main.go | 4 ++-- src/scheduler.go | 4 ++-- src/scheduler_FCFS.go | 7 +++++-- src/scheduler_fair.go | 7 +++++-- src/scheduler_priority.go | 7 +++++-- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main.go b/src/main.go index ec17852..feaae38 100644 --- a/src/main.go +++ b/src/main.go @@ -168,14 +168,14 @@ func serverAPI(w http.ResponseWriter, r *http.Request) { case "debug_enable": log.Debug("enable schedule") - js, _ := json.Marshal(scheduler.Enable) + js, _ := json.Marshal(scheduler.Enable()) w.Header().Set("Content-Type", "application/json") w.Write(js) break case "debug_disable": log.Debug("disable schedule") - js, _ := json.Marshal(scheduler.Disable) + js, _ := json.Marshal(scheduler.Disable()) w.Header().Set("Content-Type", "application/json") w.Write(js) break diff --git a/src/scheduler.go b/src/scheduler.go index c4b40b1..b0ab3dc 100644 --- a/src/scheduler.go +++ b/src/scheduler.go @@ -29,7 +29,7 @@ type Scheduler interface { Detach(GPU string, job string) - Enable() + Enable() bool - Disable() + Disable() bool } diff --git a/src/scheduler_FCFS.go b/src/scheduler_FCFS.go index 9feefca..a4e05f8 100644 --- a/src/scheduler_FCFS.go +++ b/src/scheduler_FCFS.go @@ -19,6 +19,7 @@ type SchedulerFCFS struct { func (scheduler *SchedulerFCFS) Start() { scheduler.jobs = map[string]*JobManager{} scheduler.history = []*Job{} + scheduler.enabled = true go func() { for { @@ -229,10 +230,12 @@ func (scheduler *SchedulerFCFS) Detach(GPU string, job string) { pool.detach(GPU, job) } -func (scheduler *SchedulerFCFS) Enable() { +func (scheduler *SchedulerFCFS) Enable() bool { scheduler.enabled = true + return true } -func (scheduler *SchedulerFCFS) Disable() { +func (scheduler *SchedulerFCFS) Disable() bool { scheduler.enabled = false + return true } diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go index c2b263e..c54d3ad 100644 --- a/src/scheduler_fair.go +++ b/src/scheduler_fair.go @@ -44,6 +44,7 @@ func (scheduler *SchedulerFair) Start() { scheduler.queues = map[string][]Job{} scheduler.queues["default"] = []Job{} scheduler.resourceAllocations = map[string]*ResourceCount{} + scheduler.enabled = true go func() { for { @@ -386,10 +387,12 @@ func (scheduler *SchedulerFair) Detach(GPU string, job string) { pool.detach(GPU, job) } -func (scheduler *SchedulerFair) Enable() { +func (scheduler *SchedulerFair) Enable() bool { scheduler.enabled = true + return true } -func (scheduler *SchedulerFair) Disable() { +func (scheduler *SchedulerFair) Disable() bool { scheduler.enabled = false + return true } diff --git a/src/scheduler_priority.go b/src/scheduler_priority.go index 6bc2fcf..c637809 100644 --- a/src/scheduler_priority.go +++ b/src/scheduler_priority.go @@ -19,6 +19,7 @@ type SchedulerPriority struct { func (scheduler *SchedulerPriority) Start() { scheduler.jobs = map[string]*JobManager{} scheduler.history = []*Job{} + scheduler.enabled = true go func() { for { @@ -253,10 +254,12 @@ func (scheduler *SchedulerPriority) Detach(GPU string, job string) { pool.detach(GPU, job) } -func (scheduler *SchedulerPriority) Enable() { +func (scheduler *SchedulerPriority) Enable() bool { scheduler.enabled = true + return true } -func (scheduler *SchedulerPriority) Disable() { +func (scheduler *SchedulerPriority) Disable() bool { scheduler.enabled = false + return true }