YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-15 08:16:43 +00:00
Code Issues Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Newnius
2020-04-12 11:47:20 +08:00
parent b1a2abaf0a
commit f57294b703
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/history_logger.go
View File

@@ -35,7 +35,7 @@ func (jhl *JobHistoryLogger) init() {
} }
func (jhl *JobHistoryLogger) submitJob(job Job) { func (jhl *JobHistoryLogger) submitJob(job Job) {
log.Info("submit job", job.Name) log.Debug("submit job task status", job.Name)
jhl.jobs[job.Name] = job jhl.jobs[job.Name] = job
jhl.tasks[job.Name] = []TaskStatus{} jhl.tasks[job.Name] = []TaskStatus{}
} }

11
src/job_manager.go
View File

@@ -6,7 +6,6 @@ import (
"strings" "strings"
"io/ioutil" "io/ioutil"
"encoding/json" "encoding/json"
"fmt"
"strconv" "strconv"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
@@ -101,14 +100,14 @@ func (jm *JobManager) start() {
flag := false flag := false
for i := range res.Status { for i := range res.Status {
if res.Status[i].Status == "ready" { if res.Status[i].Status == "ready" {
log.Info(jm.job.Name, "-", i, " is ready to run") log.Debug(jm.job.Name, "-", i, " is ready to run")
flag = true flag = true
} else if res.Status[i].Status == "running" { } else if res.Status[i].Status == "running" {
log.Info(jm.job.Name, "-", i, " is running") log.Debug(jm.job.Name, "-", i, " is running")
flag = true flag = true
InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, res.Status[i]) InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, res.Status[i])
} else { } else {
log.Println(jm.job.Name, "-", i, " ", res.Status[i].Status) log.Info(jm.job.Name, "-", i, " ", res.Status[i].Status)
/* save logs etc. */ /* save logs etc. */
@@ -124,10 +123,10 @@ func (jm *JobManager) start() {
/* return resource */ /* return resource */
jm.scheduler.ReleaseResource(jm.job, jm.resources[i]) jm.scheduler.ReleaseResource(jm.job, jm.resources[i])
fmt.Println("return resource ", jm.resources[i].ClientID) log.Info("return resource ", jm.resources[i].ClientID)
for _, t := range jm.resources[i].Status { for _, t := range jm.resources[i].Status {
jm.scheduler.Attach(t.UUID, jm.job.Name) jm.scheduler.Detach(t.UUID, jm.job.Name)
} }
InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, res.Status[i]) InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, res.Status[i])