fix(api): don't restart stooped jobs (#6692)

Signed-off-by: François Samin <[email protected]>
ovh · Nov 20, 2023 · 9941e10 · 9941e10
1 parent e94d2eb
commit 9941e10
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/engine/api/worker.go b/engine/api/worker.go
@@ -303,14 +303,14 @@ func DisableWorker(ctx context.Context, db *gorp.DbMap, id string, maxLogSize in
 		// Worker is awol while building !
 		// We need to restart this action
 		wNodeJob, err := workflow.LoadNodeJobRun(ctx, db, nil, jobID.Int64)
-		if err == nil && wNodeJob.Retry < 3 {
+		if err == nil && wNodeJob.Retry < 3 && !sdk.StatusIsTerminated(wNodeJob.Status) {
 			if err := workflow.RestartWorkflowNodeJob(context.TODO(), db, *wNodeJob, maxLogSize); err != nil {
 				log.Warn(ctx, "DisableWorker[%s]> Cannot restart workflow node run: %v", name, err)
 			} else {
 				log.Info(ctx, "DisableWorker[%s]> WorkflowNodeRun %d restarted after crash", name, jobID.Int64)
 			}
+			log.Info(ctx, "DisableWorker> Worker %s crashed while building %d !", name, jobID.Int64)
 		}
-		log.Info(ctx, "DisableWorker> Worker %s crashed while building %d !", name, jobID.Int64)
 	}
 	return nil
 }
diff --git a/engine/api/worker/dao.go b/engine/api/worker/dao.go
@@ -149,7 +149,7 @@ func SetStatus(ctx context.Context, db gorpmapper.SqlExecutorWithTx, workerID st
 		return err
 	}
 	w.Status = status
-	if status == sdk.StatusBuilding || status == sdk.StatusWaiting {
+	if status == sdk.StatusBuilding || status == sdk.StatusWaiting || status == sdk.StatusDisabled {
 		w.JobRunID = nil
 	}
 	dbData := &dbWorker{Worker: *w}