YAO/YAO-scheduler
1
0
Fork 0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-06-07 14:21:55 +00:00
Code Issues Releases Wiki Activity

update

Browse Source
This commit is contained in:
Newnius 2020-05-24 01:38:42 +08:00
parent 2944054d7c
commit 72da84b3cc
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/job_manager.go
View File

@ -157,38 +157,37 @@ func (jm *JobManager) start() {
/* monitor job execution */ /* monitor job execution */
for { for {
flag := jm.checkStatus() jm.status()
if !flag { if !jm.isRunning {
break break
} }
time.Sleep(time.Second * 10) time.Sleep(time.Second * 10)
} }
} }
func (jm *JobManager) checkStatus() bool { func (jm *JobManager) checkStatus(status []TaskStatus) bool {
if !jm.isRunning { if !jm.isRunning {
return false return false
} }
res := jm.status()
flag := false flag := false
onlyPS := true onlyPS := true
for i := range res.Status { for i := range status {
if res.Status[i].Status == "ready" { if status[i].Status == "ready" {
log.Debug(jm.job.Name, "-", i, " is ready to run") log.Debug(jm.job.Name, "-", i, " is ready to run")
flag = true flag = true
if !jm.job.Tasks[i].IsPS { if !jm.job.Tasks[i].IsPS {
onlyPS = false onlyPS = false
} }
} else if res.Status[i].Status == "running" { } else if status[i].Status == "running" {
log.Debug(jm.job.Name, "-", i, " is running") log.Debug(jm.job.Name, "-", i, " is running")
flag = true flag = true
if !jm.job.Tasks[i].IsPS { if !jm.job.Tasks[i].IsPS {
onlyPS = false onlyPS = false
} }
InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, res.Status[i]) InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
} else { } else {
log.Info(jm.job.Name, "-", i, " ", res.Status[i].Status) log.Info(jm.job.Name, "-", i, " ", status[i].Status)
if exitCode, ok := res.Status[i].State["ExitCode"].(float64); ok && !jm.job.Tasks[i].IsPS { if exitCode, ok := status[i].State["ExitCode"].(float64); ok && !jm.job.Tasks[i].IsPS {
if exitCode != 0 && !jm.killedFlag { if exitCode != 0 && !jm.killedFlag {
log.Warn(jm.job.Name+"-"+jm.job.Tasks[i].Name+" exited unexpected, exitCode=", exitCode) log.Warn(jm.job.Name+"-"+jm.job.Tasks[i].Name+" exited unexpected, exitCode=", exitCode)
jm.killedFlag = true jm.killedFlag = true
@ -216,7 +215,7 @@ func (jm *JobManager) checkStatus() bool {
jm.scheduler.Detach(t.UUID, jm.job) jm.scheduler.Detach(t.UUID, jm.job)
} }
InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, res.Status[i]) InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
} }
} }
} }
@ -306,6 +305,7 @@ func (jm *JobManager) status() MsgJobStatus {
tasksStatus[i] = res.Status tasksStatus[i] = res.Status
} }
jm.checkStatus(tasksStatus)
return MsgJobStatus{Status: tasksStatus} return MsgJobStatus{Status: tasksStatus}
} }