From beee8bb2867255924e6260f2309a20adcb066fe1 Mon Sep 17 00:00:00 2001 From: Newnius Date: Thu, 30 Apr 2020 16:11:34 +0800 Subject: [PATCH] update --- README.md | 12 ++++++++++++ src/main.go | 14 ++++++++++++++ src/optimizer.go | 10 ++++++++-- src/scheduler_fair.go | 2 -- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9868cb3..d0a153d 100644 --- a/README.md +++ b/README.md @@ -36,4 +36,16 @@ GPU is occupied by which job(s) **UpdateMaxParallelism** ``` ?action=debug_update_parallelism¶llelism=5 +``` + + +**getAllPredicts** +``` +?action=debug_get_predicts +``` + + +**getAllGPUUtils** +``` +?action=debug_get_gpu_utils ``` \ No newline at end of file diff --git a/src/main.go b/src/main.go index ed59cfc..173a795 100644 --- a/src/main.go +++ b/src/main.go @@ -189,6 +189,20 @@ func serverAPI(w http.ResponseWriter, r *http.Request) { w.Write(js) break + case "debug_get_predicts": + log.Debug("debug_get_predicts") + js, _ := json.Marshal(InstanceOfOptimizer().getAllPredicts()) + w.Header().Set("Content-Type", "application/json") + w.Write(js) + break + + case "debug_get_gpu_utils": + log.Debug("debug_get_gpu_utils") + js, _ := json.Marshal(InstanceOfOptimizer().getAllGPUUtils()) + w.Header().Set("Content-Type", "application/json") + w.Write(js) + break + default: http.Error(w, "Not Found", http.StatusNotFound) break diff --git a/src/optimizer.go b/src/optimizer.go index d46a0a3..d2917b4 100644 --- a/src/optimizer.go +++ b/src/optimizer.go @@ -84,8 +84,6 @@ func (optimizer *Optimizer) feed(job string, utils []int) { predict.Main = predict.Total - predict.Pre - predict.Post predict.Version++ } - log.Info(optimizer.jobUtilsGPU) - log.Info(optimizer.predicts) }() } @@ -115,3 +113,11 @@ func (optimizer *Optimizer) predictTime(job string) (*OptimizerJobExecutionTime, } return &OptimizerJobExecutionTime{}, false } + +func (optimizer *Optimizer) getAllPredicts() map[string]*OptimizerJobExecutionTime { + return optimizer.predicts +} + +func (optimizer *Optimizer) getAllGPUUtils() map[string]int { + return optimizer.jobUtilsGPU +} diff --git a/src/scheduler_fair.go b/src/scheduler_fair.go index c2efbfa..58ea600 100644 --- a/src/scheduler_fair.go +++ b/src/scheduler_fair.go @@ -314,8 +314,6 @@ func (scheduler *SchedulerFair) ReleaseResource(job Job, agent NodeStatus) { pool.poolsMu[poolID].Lock() defer pool.poolsMu[poolID].Unlock() - log.Info(agent) - node := pool.pools[poolID][agent.ClientID] for _, gpu := range agent.Status { for j := range node.Status {