Browse Source

fix-bug

tags/V1.22.3.1^2
liuzx 3 years ago
parent
commit
ec47b9cb98
2 changed files with 4 additions and 4 deletions
  1. +3
    -2
      modules/cloudbrain/cloudbrain.go
  2. +1
    -2
      routers/repo/cloudbrain.go

+ 3
- 2
modules/cloudbrain/cloudbrain.go View File

@@ -239,7 +239,7 @@ func GenerateTask(ctx *context.Context, displayJobName, jobName, image, command,
return nil
}

func RestartTask(ctx *context.Context, task *models.Cloudbrain, newJobID *string) error {
func RestartTask(ctx *context.Context, task *models.Cloudbrain, newID *string) error {
dataActualPath := setting.Attachment.Minio.RealPath +
setting.Attachment.Minio.Bucket + "/" +
setting.Attachment.Minio.BasePath +
@@ -361,7 +361,8 @@ func RestartTask(ctx *context.Context, task *models.Cloudbrain, newJobID *string
return err
}

*newJobID = jobID
idString := strconv.FormatInt(newTask.ID, 10)
*newID = idString

return nil
}

+ 1
- 2
routers/repo/cloudbrain.go View File

@@ -287,7 +287,6 @@ func CloudBrainRestart(ctx *context.Context) {
if err != nil {
ctx.Data["error"] = err.Error()
}
jobID := task.JobID
for {
if task.Status != string(models.JobStopped) && task.Status != string(models.JobSucceeded) && task.Status != string(models.JobFailed) {
log.Error("the job(%s) is not stopped", task.JobName, ctx.Data["MsgID"])
@@ -325,7 +324,7 @@ func CloudBrainRestart(ctx *context.Context) {
}
}

err = cloudbrain.RestartTask(ctx, task, &jobID)
err = cloudbrain.RestartTask(ctx, task, &ID)
if err != nil {
log.Error("RestartTask failed:%v", err.Error(), ctx.Data["MsgID"])
resultCode = "-1"


Loading…
Cancel
Save