1
0
mirror of https://github.com/newnius/YAO-scheduler.git synced 2025-12-13 07:46:43 +00:00
This commit is contained in:
2020-05-26 09:03:21 +08:00
parent f9c95cebcb
commit 3c40765c22
2 changed files with 11 additions and 3 deletions

View File

@@ -179,6 +179,13 @@ func (jm *JobManager) checkStatus(status []TaskStatus) {
onlyPS = false
}
InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
} else if status[i].Status == "unknown" {
log.Warn(jm.job.Name, "-", i, " is unknown")
flagRunning = true
if !jm.job.Tasks[i].IsPS {
onlyPS = false
}
//InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
} else {
log.Info(jm.job.Name, "-", i, " ", status[i].Status)
if exitCode, ok := status[i].State["ExitCode"].(float64); ok && exitCode != 0 && !jm.killFlag {
@@ -272,6 +279,10 @@ func (jm *JobManager) status() MsgJobStatus {
tasksStatus[i] = TaskStatus{Status: "unknown", State: map[string]interface{}{"ExitCode": float64(-1)}}
continue
}
if res.Code != 0 {
tasksStatus[i] = TaskStatus{Status: "notexist", State: map[string]interface{}{"ExitCode": float64(1)}}
continue
}
res.Status.Node = taskStatus.Node
tasksStatus[i] = res.Status
}

View File

@@ -147,9 +147,6 @@ func (pool *ResourcePool) checkDeadNodes() {
seg = seg.Next
}
seg.Lock.Lock()
if seg.Nodes == nil {
seg = seg.Next
}
delete(seg.Nodes, v)
seg.Lock.Unlock()
delete(pool.heartBeat, v)