Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-26 05:14:13 +01:00
Code Packages Releases Activity

Merge pull request #1747 from ricardomaraschini/fix-context-cancellation

Browse Source 
chore: give tracing.Shutdown() its own context
This commit is contained in:
Kubernetes Prow Robot
2025-09-25 07:54:18 -07:00
committed by GitHub
parent 483c9c1499 f9a3be8cde
commit e599018adb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/descheduler/app/server.go
View File

@@ -22,6 +22,7 @@ import (
"io" "io"
"os/signal" "os/signal"
"syscall" "syscall"
"time"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@@ -111,7 +112,14 @@ func Run(rootCtx context.Context, rs *options.DeschedulerServer) error {
if err != nil { if err != nil {
klog.ErrorS(err, "failed to create tracer provider") klog.ErrorS(err, "failed to create tracer provider")
} }
defer tracing.Shutdown(ctx) defer func() {
// we give the tracing.Shutdown() its own context as the
// original context may have been cancelled already. we
// have arbitrarily chosen the timeout duration.
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()
tracing.Shutdown(ctx)
}()
// increase the fake watch channel so the dry-run mode can be run // increase the fake watch channel so the dry-run mode can be run
// over a cluster with thousands of pods // over a cluster with thousands of pods