diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2020-03-09 16:00:11 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-18 07:14:20 +0100 |
| commit | a89327c1f7708173beb037386cea0b77357ed52c (patch) | |
| tree | 66c6c332405a1d30acc011aac5265e3a250323d8 | |
| parent | bef7177cefad180b9776ed49290d42bfb873da1e (diff) | |
| download | linux-stable-a89327c1f7708173beb037386cea0b77357ed52c.tar.gz linux-stable-a89327c1f7708173beb037386cea0b77357ed52c.tar.bz2 linux-stable-a89327c1f7708173beb037386cea0b77357ed52c.zip | |
ktest: Add timeout for ssh sync testing
commit 4d00fc477a2ce8b6d2b09fb34ef9fe9918e7d434 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rwxr-xr-x | tools/testing/ktest/ktest.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 87af8a68ab25..3118fc0d149b 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1372,7 +1372,7 @@ sub reboot { } else { # Make sure everything has been written to disk - run_ssh("sync"); + run_ssh("sync", 10); if (defined($time)) { start_monitor; |