Skip to content

Commit 460dc6f

Browse files
committed
add wait for ssh ready
1 parent c3ed8c4 commit 460dc6f

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

pkg/testcase/upgradenodereplacement.go

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,14 @@ func TestUpgradeReplaceNode(cluster *shared.Cluster, flags *customflag.FlagConfi
6262
_, updateErr := shared.RunCommandOnNode(cmd, ip)
6363
Expect(updateErr).NotTo(HaveOccurred())
6464
rebootInstances(awsClient, ip)
65+
sshErr := waitForSSHReady(ip)
66+
if sshErr != nil {
67+
shared.LogLevel("warn", "connecting via SSH to %s to run commands after reboot of node: %w\n", ip, sshErr)
68+
}
6569
}
6670
}
6771
// bracket sleep to ensure ssh to instance works instead of waiting for every node to get ready
68-
time.Sleep(20 * time.Second)
72+
// time.Sleep(20 * time.Second)
6973

7074
serverErr := nodeReplaceServers(cluster, awsClient, resourceName, serverLeaderIP, token,
7175
version,
@@ -577,11 +581,15 @@ func nodeReplaceAgents(
577581
_, updateErr := shared.RunCommandOnNode(cmd, ip)
578582
Expect(updateErr).NotTo(HaveOccurred())
579583
rebootInstances(awsClient, ip)
584+
sshErr := waitForSSHReady(ip)
585+
if sshErr != nil {
586+
shared.LogLevel("error", "connecting via SSH to %s to run commands after reboot of node: %w\n", ip, sshErr)
587+
}
580588
}
581589
}
582590
// bracket sleep instead of waiting for every ip to get ssh ready
583-
shared.LogLevel("debug", "sleep 20 to ensure ssh works before next cmd")
584-
time.Sleep(20 * time.Second)
591+
// shared.LogLevel("debug", "sleep 20 to ensure ssh works before next cmd")
592+
// time.Sleep(20 * time.Second)
585593

586594
agentErr := replaceAgents(cluster, awsClient, serverLeaderIp, token, version, channel, nodeOS,
587595
newExternalAgentIps, newPrivateAgentIps)

0 commit comments

Comments
 (0)