mirror of
https://github.com/newnius/YAO-scheduler.git
synced 2025-12-15 08:16:43 +00:00
bugfix
This commit is contained in:
@@ -179,6 +179,13 @@ func (jm *JobManager) checkStatus(status []TaskStatus) {
|
|||||||
onlyPS = false
|
onlyPS = false
|
||||||
}
|
}
|
||||||
InstanceJobHistoryLogger().submitTaskStatus(jm.job.Name, status[i])
|
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 {
|
} else {
|
||||||
log.Info(jm.job.Name, "-", i, " ", status[i].Status)
|
log.Info(jm.job.Name, "-", i, " ", status[i].Status)
|
||||||
if exitCode, ok := status[i].State["ExitCode"].(float64); ok && exitCode != 0 && !jm.killFlag {
|
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)}}
|
tasksStatus[i] = TaskStatus{Status: "unknown", State: map[string]interface{}{"ExitCode": float64(-1)}}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
if res.Code != 0 {
|
||||||
|
tasksStatus[i] = TaskStatus{Status: "notexist", State: map[string]interface{}{"ExitCode": float64(1)}}
|
||||||
|
continue
|
||||||
|
}
|
||||||
res.Status.Node = taskStatus.Node
|
res.Status.Node = taskStatus.Node
|
||||||
tasksStatus[i] = res.Status
|
tasksStatus[i] = res.Status
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -147,9 +147,6 @@ func (pool *ResourcePool) checkDeadNodes() {
|
|||||||
seg = seg.Next
|
seg = seg.Next
|
||||||
}
|
}
|
||||||
seg.Lock.Lock()
|
seg.Lock.Lock()
|
||||||
if seg.Nodes == nil {
|
|
||||||
seg = seg.Next
|
|
||||||
}
|
|
||||||
delete(seg.Nodes, v)
|
delete(seg.Nodes, v)
|
||||||
seg.Lock.Unlock()
|
seg.Lock.Unlock()
|
||||||
delete(pool.heartBeat, v)
|
delete(pool.heartBeat, v)
|
||||||
|
|||||||
Reference in New Issue
Block a user