Merge pull request kubernetes#125537 from seans3/rc-fallback-log

k8s-ci-robot · web-flow · commit d48a3036be80 · 2024-06-25T16:47:20.000-07:00
Adds logging during remote command executor fallback
diff --git a/staging/src/k8s.io/client-go/tools/remotecommand/fallback.go b/staging/src/k8s.io/client-go/tools/remotecommand/fallback.go
@@ -18,6 +18,8 @@ package remotecommand
 
 import (
 	"context"
+
+	"k8s.io/klog/v2"
 )
 
 var _ Executor = &FallbackExecutor{}
@@ -51,6 +53,7 @@ func (f *FallbackExecutor) Stream(options StreamOptions) error {
 func (f *FallbackExecutor) StreamWithContext(ctx context.Context, options StreamOptions) error {
 	err := f.primary.StreamWithContext(ctx, options)
 	if f.shouldFallback(err) {
+		klog.V(4).Infof("RemoteCommand fallback: %v", err)
 		return f.secondary.StreamWithContext(ctx, options)
 	}
 	return err

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ package remotecommand`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"context"`
	`21`	`+`
	`22`	`+ "k8s.io/klog/v2"`
`21`	`23`	`)`
`22`	`24`
`23`	`25`	`var _ Executor = &FallbackExecutor{}`
`@@ -51,6 +53,7 @@ func (f *FallbackExecutor) Stream(options StreamOptions) error {`
`51`	`53`	`func (f *FallbackExecutor) StreamWithContext(ctx context.Context, options StreamOptions) error {`
`52`	`54`	`err := f.primary.StreamWithContext(ctx, options)`
`53`	`55`	`if f.shouldFallback(err) {`
	`56`	`+ klog.V(4).Infof("RemoteCommand fallback: %v", err)`
`54`	`57`	`return f.secondary.StreamWithContext(ctx, options)`
`55`	`58`	`}`
`56`	`59`	`return err`