Merge pull request kubernetes#109314 from SergeyKanzhelev/properRetryInSSH

k8s-ci-robot · web-flow · commit 25fa92cd7d23 · 2022-04-05T13:34:01.000-07:00
fix the retry logic in ssh in test framework
diff --git a/test/e2e/framework/ssh/ssh.go b/test/e2e/framework/ssh/ssh.go
@@ -244,7 +244,7 @@ func runSSHCommand(cmd, user, host string, signer ssh.Signer) (string, string, i
 		err = wait.Poll(5*time.Second, 20*time.Second, func() (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, err
+				return false, nil // retrying, error will be logged above
 			}
 			return true, nil
 		})

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ func runSSHCommand(cmd, user, host string, signer ssh.Signer) (string, string, i`
`244`	`244`	`err = wait.Poll(5time.Second, 20time.Second, func() (bool, error) {`
`245`	`245`	`fmt.Printf("error dialing %s@%s: '%v', retrying\n", user, host, err)`
`246`	`246`	`if client, err = ssh.Dial("tcp", host, config); err != nil {`
`247`		`- return false, err`
	`247`	`+ return false, nil // retrying, error will be logged above`
`248`	`248`	`}`
`249`	`249`	`return true, nil`
`250`	`250`	`})`