github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

E2E framework ssh: avoid log spam in runSSHCommand

Browse Source 
Emitting "error dialing" on each retry spams the test log output even when the
tests succeed.

Using Eventually also has other advantages (better failure message, support for
Gingko progress reports when a test is stuck).
This commit is contained in:
Patrick Ohly
2026-01-22 12:00:09 +01:00
parent 2274f69d9a
commit dd78c81057
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/framework/ssh/ssh.go
View File

@@ -247,16 +247,12 @@ func runSSHCommand(ctx context.Context, cmd, user, host string, signer ssh.Signe
Auth: []ssh.AuthMethod{ssh.PublicKeys(signer)},
HostKeyCallback: ssh.InsecureIgnoreHostKey(),
}
client, err := ssh.Dial("tcp", host, config)
if err != nil {
err = wait.PollUntilContextTimeout(ctx, 5*time.Second, 20*time.Second, false, func(ctx context.Context) (bool, error) {
fmt.Printf("error dialing %s@%s: '%v', retrying\n", user, host, err)
if client, err = ssh.Dial("tcp", host, config); err != nil {
return false, nil // retrying, error will be logged above
}
return true, nil
})
}
var client *ssh.Client
err := framework.Gomega().Eventually(ctx, func() error {
c, err := ssh.Dial("tcp", host, config)
client = c
return err
}).WithPolling(5 * time.Second).WithTimeout(20 * time.Second).Should(gomega.Succeed())
if err != nil {
return "", "", 0, fmt.Errorf("error getting SSH client to %s@%s: %w", user, host, err)
}