#562 同步云脑侧与平台侧任务状态(FAILED状态)

Merged
lewis merged 1 commits from sync_failed_status into V20211101 2 years ago
  1. +8
    -5
      routers/api/v1/repo/cloudbrain.go
  2. +1
    -2
      templates/repo/cloudbrain/index.tmpl

+ 8
- 5
routers/api/v1/repo/cloudbrain.go View File

@@ -65,12 +65,15 @@ func GetCloudbrainTask(ctx *context.APIContext) {
return
}

taskRoles := result.TaskRoles
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))
job.Status = result.JobStatus.State
if result.JobStatus.State != string(models.JobWaiting) && result.JobStatus.State != string(models.JobFailed) {
taskRoles := result.TaskRoles
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{}))

job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
job.ContainerID = taskRes.TaskStatuses[0].ContainerID
job.Status = taskRes.TaskStatuses[0].State
job.ContainerIp = taskRes.TaskStatuses[0].ContainerIP
job.ContainerID = taskRes.TaskStatuses[0].ContainerID
job.Status = taskRes.TaskStatuses[0].State
}

if result.JobStatus.State != string(models.JobWaiting) {
err = models.UpdateJob(job)


+ 1
- 2
templates/repo/cloudbrain/index.tmpl View File

@@ -491,7 +491,7 @@
console.log("---------",index,job)
const jobID = job.dataset.jobid;
const repoPath = job.dataset.repopath;
if (job.textContent.trim() == 'STOPPED') {
if (job.textContent.trim() == 'STOPPED' || job.textContent.trim() == 'FAILED') {
return
}
@@ -499,7 +499,6 @@
$.get(`/api/v1/repos/${repoPath}/cloudbrain/${jobID}`, (data) => {
const jobID = data.JobID
const status = data.JobStatus
console.log("status",status)
if (status != job.textContent.trim()) {
//$('#' + jobID).text(status)
//if (status == 'STOPPED') {


Loading…
Cancel
Save