cleanup don't remove every ephemeral runner that has a job assigned

go-gitea · lunny · Mar 14, 2025 · Nov 9, 2024 · Nov 9, 2024 · Feb 8, 2025
commit 2fe409146307f7fee9bf4c1e4744b14263e06618
diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go
@@ -135,7 +135,7 @@ const deleteEphemeralRunnerBatchSize = 100
 // CleanupEphemeralRunners removes used ephemeral runners which are no longer able to process jobs
 func CleanupEphemeralRunners(ctx context.Context) error {
 	runners := []*actions_model.ActionRunner{}
-	err := db.GetEngine(ctx).Join("INNER", "action_task", "action_task.runner_id = action_runner.id").Where("action_runner.ephemeral").Limit(deleteEphemeralRunnerBatchSize).Find(&runners)
+	err := db.GetEngine(ctx).Join("INNER", "action_task", "action_task.runner_id = action_runner.id").Where("action_runner.ephemeral and action_task.status != ? and action_task.status != ? and action_task.status != ?)", actions_model.StatusWaiting, actions_model.StatusRunning, actions_model.StatusBlocked).Limit(deleteEphemeralRunnerBatchSize).Find(&runners)
 	if err != nil {
 		return fmt.Errorf("find runners: %w", err)
 	}