Merge pull request kubernetes#133309 from macsko/fix_race_with_closing_api_dispatcher

k8s-ci-robot · web-flow · commit ea81dd6d01d6 · 2025-08-01T02:47:38.000-07:00
Fix potential race in closing API dispatcher
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -526,7 +526,7 @@ func (sched *Scheduler) Run(ctx context.Context) {
 	sched.SchedulingQueue.Run(logger)
 
 	if sched.APIDispatcher != nil {
-		go sched.APIDispatcher.Run(logger)
+		sched.APIDispatcher.Run(logger)
 	}
 
 	// We need to start scheduleOne loop in a dedicated goroutine,

Original file line number	Diff line number	Diff line change
`@@ -526,7 +526,7 @@ func (sched *Scheduler) Run(ctx context.Context) {`
`526`	`526`	`sched.SchedulingQueue.Run(logger)`
`527`	`527`
`528`	`528`	`if sched.APIDispatcher != nil {`
`529`		`- go sched.APIDispatcher.Run(logger)`
	`529`	`+ sched.APIDispatcher.Run(logger)`
`530`	`530`	`}`
`531`	`531`
`532`	`532`	`// We need to start scheduleOne loop in a dedicated goroutine,`