| From 3fd9b7fa2acd0ff0e00d23c8ea262a194a04511b Mon Sep 17 00:00:00 2001 |
| From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> |
| Date: Mon, 9 Mar 2020 16:00:11 -0400 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl |
| index 220d04f958a6..42b6cd41d2ea 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; |
| -- |
| 2.7.4 |
| |
