Skip to content

Commit c958ad1

Browse files
committed
Close stop channel if we receive error
1 parent 085711e commit c958ad1

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

  • vertical-pod-autoscaler

vertical-pod-autoscaler/pkg/recommender/main.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ func run(ctx context.Context, healthCheck *metrics.HealthCheck, config *recommen
153153
stopCh,
154154
)
155155

156+
if err != nil {
157+
close(stopCh) // Clean up any started routines
158+
klog.ErrorS(err, "Failed to create recommender controller")
159+
klog.FlushAndExit(klog.ExitFlushTimeout, 1)
160+
}
161+
156162
factory.Start(stopCh)
157163
informerMap := factory.WaitForCacheSync(stopCh)
158164
for kind, synced := range informerMap {
@@ -162,11 +168,6 @@ func run(ctx context.Context, healthCheck *metrics.HealthCheck, config *recommen
162168
}
163169
}
164170

165-
if err != nil {
166-
klog.ErrorS(err, "Failed to create recommender controller")
167-
klog.FlushAndExit(klog.ExitFlushTimeout, 1)
168-
}
169-
170171
if err := controller.Run(ctx); err != nil {
171172
klog.ErrorS(err, "Recommender controller exited with error")
172173
klog.FlushAndExit(klog.ExitFlushTimeout, 1)

vertical-pod-autoscaler/test/integration/recommender/util.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ func recommenderSetup(t *testing.T, recommenderConfig *recommender_config.Recomm
158158
stopCh,
159159
)
160160
if err != nil {
161+
close(stopCh) // Clean up any started routines
161162
t.Fatalf("Error creating recommender controller: %v", err)
162163
}
163164

0 commit comments

Comments
 (0)