|
@@ -281,17 +281,30 @@ func CloudBrainShow(ctx *context.Context) { |
|
|
if result != nil { |
|
|
if result != nil { |
|
|
jobRes, _ := models.ConvertToJobResultPayload(result.Payload) |
|
|
jobRes, _ := models.ConvertToJobResultPayload(result.Payload) |
|
|
jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") |
|
|
jobRes.Resource.Memory = strings.ReplaceAll(jobRes.Resource.Memory, "Mi", "MB") |
|
|
ctx.Data["result"] = jobRes |
|
|
|
|
|
taskRoles := jobRes.TaskRoles |
|
|
taskRoles := jobRes.TaskRoles |
|
|
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) |
|
|
|
|
|
ctx.Data["taskRes"] = taskRes |
|
|
|
|
|
task.Status = taskRes.TaskStatuses[0].State |
|
|
|
|
|
task.ContainerID = taskRes.TaskStatuses[0].ContainerID |
|
|
|
|
|
task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP |
|
|
|
|
|
err = models.UpdateJob(task) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
ctx.Data["error"] = err.Error() |
|
|
|
|
|
|
|
|
if jobRes.JobStatus.State != string(models.JobFailed) { |
|
|
|
|
|
taskRes, _ := models.ConvertToTaskPod(taskRoles[cloudbrain.SubTaskName].(map[string]interface{})) |
|
|
|
|
|
ctx.Data["taskRes"] = taskRes |
|
|
|
|
|
task.Status = taskRes.TaskStatuses[0].State |
|
|
|
|
|
task.ContainerID = taskRes.TaskStatuses[0].ContainerID |
|
|
|
|
|
task.ContainerIp = taskRes.TaskStatuses[0].ContainerIP |
|
|
|
|
|
err = models.UpdateJob(task) |
|
|
|
|
|
if err != nil { |
|
|
|
|
|
ctx.Data["error"] = err.Error() |
|
|
|
|
|
} |
|
|
|
|
|
} else { |
|
|
|
|
|
task.Status = jobRes.JobStatus.State |
|
|
|
|
|
taskRes := models.TaskPod{TaskStatuses: []models.TaskStatuses{ |
|
|
|
|
|
{ |
|
|
|
|
|
State: jobRes.JobStatus.State, |
|
|
|
|
|
}, |
|
|
|
|
|
}} |
|
|
|
|
|
ctx.Data["taskRes"] = taskRes |
|
|
|
|
|
jobRes.JobStatus.StartTime = time.Unix(int64(task.CreatedUnix), 0).Format("2006-01-02 15:04:05") |
|
|
|
|
|
jobRes.JobStatus.EndTime = time.Unix(int64(task.UpdatedUnix), 0).Format("2006-01-02 15:04:05") |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ctx.Data["result"] = jobRes |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
ctx.Data["task"] = task |
|
|
ctx.Data["task"] = task |
|
@@ -351,7 +364,7 @@ func CloudBrainStop(ctx *context.Context) { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if task.Status == string(models.JobStopped) { |
|
|
|
|
|
|
|
|
if task.Status == string(models.JobStopped) || task.Status == string(models.JobFailed) { |
|
|
log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"]) |
|
|
log.Error("the job(%s) has been stopped", task.JobName, ctx.Data["msgID"]) |
|
|
ctx.ServerError("the job has been stopped", errors.New("the job has been stopped")) |
|
|
ctx.ServerError("the job has been stopped", errors.New("the job has been stopped")) |
|
|
return |
|
|
return |
|
|