summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSteven Rostedt (VMware) <rostedt@goodmis.org>2020-03-09 23:00:11 +0300
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2020-03-09 23:04:31 +0300
commit4d00fc477a2ce8b6d2b09fb34ef9fe9918e7d434 (patch)
tree4c0de073f5050407b42ae4596a606e4b7068c444 /tools
parent791dc9d6b3ca4291be6cfce7b9be468d61d7ed95 (diff)
downloadlinux-4d00fc477a2ce8b6d2b09fb34ef9fe9918e7d434.tar.xz
ktest: Add timeout for ssh sync testing
Before rebooting the box, a "ssh sync" is called to the test machine to see if it is alive or not. But if the test machine is in a partial state, that ssh may never actually finish, and the ktest test hangs. Add a 10 second timeout to the sync test, which will fail after 10 seconds and then cause the test to reboot the test machine. Cc: stable@vger.kernel.org Fixes: 6474ace999edd ("ktest.pl: Powercycle the box on reboot if no connection can be made") Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/testing/ktest/ktest.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 6a605ba75dd6..8bdd7253c110 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1383,7 +1383,7 @@ sub reboot {
} else {
# Make sure everything has been written to disk
- run_ssh("sync");
+ run_ssh("sync", 10);
if (defined($time)) {
start_monitor;