Merge branch 'main' into no-more-utils

tempusfrangit · web-flow · commit fc85e3bca554 · 2025-09-16T08:25:49.000-07:00
diff --git a/internal/runner/manager.go b/internal/runner/manager.go
@@ -435,6 +435,7 @@ func (m *Manager) allocatePrediction(runner *Runner, req PredictionRequest) { //
 						if err != nil {
 							logger.Errorw("failed to stop runner in one-shot mode", "error", err, "runner_id", runner.runnerCtx.id)
 						}
+						runner.ForceKill()
 					case <-time.After(timeout):
 						logger.Warnw("stop timeout exceeded in one-shot mode, falling back to force kill", "timeout", timeout, "runner_id", runner.runnerCtx.id)
 						runner.ForceKill()
diff --git a/script/test-setuid-cleanup.sh b/script/test-setuid-cleanup.sh
@@ -45,7 +45,7 @@ docker run -it --detach \
     --volume "$PWD":/src python:latest \
     -c "$SCRIPT"
 
-#trap 'docker stop $name' EXIT
+trap 'docker stop $name' EXIT
 
 # Wait for server to be ready
 sleep 3

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ func (m Manager) allocatePrediction(runner Runner, req PredictionRequest) { //`
`435`	`435`	`if err != nil {`
`436`	`436`	`logger.Errorw("failed to stop runner in one-shot mode", "error", err, "runner_id", runner.runnerCtx.id)`
`437`	`437`	`}`
	`438`	`+ runner.ForceKill()`
`438`	`439`	`case <-time.After(timeout):`
`439`	`440`	`logger.Warnw("stop timeout exceeded in one-shot mode, falling back to force kill", "timeout", timeout, "runner_id", runner.runnerCtx.id)`
`440`	`441`	`runner.ForceKill()`