diff mbox series

ktest.pl: Fix missing "end_monitor" when machine check fails

Message ID 20230118114301.6b4d09cf@gandalf.local.home
State New
Headers
Series ktest.pl: Fix missing "end_monitor" when machine check fails |

Commit Message

Steven Rostedt Jan. 18, 2023, 4:43 p.m. UTC 
  From: Steven Rostedt <rostedt@goodmis.org>

In the "reboot" command, it does a check of the machine to see if it is
still alive with a simple "ssh echo" command. If it fails, it will assume
that a normal "ssh reboot" is not possible and force a power cycle.

In this case, the "start_monitor" is executed, but the "end_monitor" is
not, and this causes the screen not to be given back to the console. That
is, after the test, a "reset" command needs to be performed, as "echo" is
turned off.

Fixes: 6474ace999edd ("ktest.pl: Powercycle the box on reboot if no connection can be made")
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 tools/testing/ktest/ktest.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Steven Rostedt Jan. 18, 2023, 4:45 p.m. UTC | #1 
On Wed, 18 Jan 2023 11:43:01 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:

> In the "reboot" command, it does a check of the machine to see if it is
> still alive with a simple "ssh echo" command. If it fails, it will assume
> that a normal "ssh reboot" is not possible and force a power cycle.
> 
> In this case, the "start_monitor" is executed, but the "end_monitor" is
> not, and this causes the screen not to be given back to the console. That

	"the screen will not be given back"

Will try to remember to update this when I import it.

-- Steve

> is, after the test, a "reset" command needs to be performed, as "echo" is
> turned off.
> 
> Fixes: 6474ace999edd ("ktest.pl: Powercycle the box on reboot if no connection can be made")
> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
> ---
diff mbox series

Patch

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 6f9fff88cedf..f2f48ce6ac4d 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1499,7 +1499,8 @@  sub reboot {
 
 	# Still need to wait for the reboot to finish
 	wait_for_monitor($time, $reboot_success_line);
-
+    }
+    if ($powercycle || $time) {
 	end_monitor;
     }
 }