fix(patch/v25.2): apply worker status fix (#613)

ecrupper · web-flow · commit 964d7a1b5cee · 2024-11-01T13:54:43.000-05:00
diff --git a/cmd/vela-worker/register.go b/cmd/vela-worker/register.go
@@ -73,8 +73,11 @@ func (w *Worker) checkIn(config *api.Worker) (bool, string, error) {
 
 			return false, "", fmt.Errorf("unable to refresh auth for worker %s on the server: %w", config.GetHostname(), err)
 		}
+
+		status := w.getWorkerStatusFromConfig(config)
+
 		// update worker status to Idle when checkIn is successful.
-		w.updateWorkerStatus(config, constants.WorkerStatusIdle)
+		w.updateWorkerStatus(config, status)
 
 		break
 	}
@@ -113,8 +116,10 @@ func (w *Worker) queueCheckIn(ctx context.Context, registryWorker *api.Worker) (
 		return false, pErr
 	}
 
+	status := w.getWorkerStatusFromConfig(registryWorker)
+
 	// update worker status to Idle when setup and ping are good.
-	w.updateWorkerStatus(registryWorker, constants.WorkerStatusIdle)
+	w.updateWorkerStatus(registryWorker, status)
 
 	return true, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,11 @@ func (w Worker) checkIn(config api.Worker) (bool, string, error) {`
`73`	`73`
`74`	`74`	`return false, "", fmt.Errorf("unable to refresh auth for worker %s on the server: %w", config.GetHostname(), err)`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+ status := w.getWorkerStatusFromConfig(config)`
	`78`	`+`
`76`	`79`	`// update worker status to Idle when checkIn is successful.`
`77`		`- w.updateWorkerStatus(config, constants.WorkerStatusIdle)`
	`80`	`+ w.updateWorkerStatus(config, status)`
`78`	`81`
`79`	`82`	`break`
`80`	`83`	`}`
`@@ -113,8 +116,10 @@ func (w Worker) queueCheckIn(ctx context.Context, registryWorker api.Worker) (`
`113`	`116`	`return false, pErr`
`114`	`117`	`}`
`115`	`118`
	`119`	`+ status := w.getWorkerStatusFromConfig(registryWorker)`
	`120`	`+`
`116`	`121`	`// update worker status to Idle when setup and ping are good.`
`117`		`- w.updateWorkerStatus(registryWorker, constants.WorkerStatusIdle)`
	`122`	`+ w.updateWorkerStatus(registryWorker, status)`
`118`	`123`
`119`	`124`	`return true, nil`
`120`	`125`	`}`