Skip to content

Commit 72613a0

Browse files
authored
fix: honor -stderrthreshold when -logtostderr=true (#6847) (#6869)
1 parent 978006d commit 72613a0

3 files changed

Lines changed: 16 additions & 3 deletions

File tree

cmd/tidb-backup-manager/main.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
package main
1616

1717
import (
18+
"flag"
19+
"fmt"
1820
"os"
1921

2022
"k8s.io/klog/v2"
@@ -24,6 +26,17 @@ import (
2426

2527
func main() {
2628
klog.InitFlags(nil)
29+
// Opt into the new klog behavior so that -stderrthreshold is honored even
30+
// when -logtostderr=true (the default).
31+
// Ref: kubernetes/klog#212, kubernetes/klog#432
32+
if err := flag.Set("legacy_stderr_threshold_behavior", "false"); err != nil {
33+
fmt.Fprintf(os.Stderr, "failed to set legacy_stderr_threshold_behavior: %v\n", err)
34+
os.Exit(1)
35+
}
36+
if err := flag.Set("stderrthreshold", "INFO"); err != nil {
37+
fmt.Fprintf(os.Stderr, "failed to set stderrthreshold: %v\n", err)
38+
os.Exit(1)
39+
}
2740
if err := app.Run(); err != nil {
2841
os.Exit(1)
2942
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
k8s.io/client-go v0.32.13
1919
k8s.io/component-base v0.32.13
2020
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7
21-
k8s.io/klog/v2 v2.130.1
21+
k8s.io/klog/v2 v2.140.0
2222
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff
2323
k8s.io/kubectl v0.32.13
2424
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -810,8 +810,8 @@ k8s.io/component-base v0.32.13 h1:QTroT4xOtYXc8ySp7Wvj5llxDNxz16YoG5Pw3zJBMds=
810810
k8s.io/component-base v0.32.13/go.mod h1:hfuVb9GlAuoIXRimoph+0e862qEwxRA7h+6oOIFelCE=
811811
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog=
812812
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU=
813-
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
814-
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
813+
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
814+
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
815815
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4=
816816
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
817817
k8s.io/kubectl v0.32.13 h1:SgKMRUwpRIR+8DHPphU/wDskNsj0Jtf6bEVyuus+FtI=

0 commit comments

Comments
 (0)