[tools 1/3] testbot/LibvirtTool: Do not require '-off' to be at the end of the snapshot name.

[Francois Gouget]

One could certainly reorder the elements of the snapshot name so '-off'
is the last part but it's not always natural.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
For now this is just for the TestBot administrator convenience but a
later patch will make the snapshot name parsing more modular and the
flags (including -off) will be position independent. So ShutDown() will
be ready when then.
---
 testbot/bin/LibvirtTool.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index 681223f11c..f14d54cd3b 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -284,7 +284,7 @@ sub ShutDown()
 {
   my $Domain = $VM->GetDomain();
   my $CurrentSnapshot = $Domain->GetSnapshotName();
-  if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off$/ or
+  if (!defined $CurrentSnapshot or $CurrentSnapshot !~ /-off\b/ or
       !$Domain->IsPoweredOn())
   {
     return 1;
-- 
2.30.2

[tools 2/3] testbot/LibvirtTool: Simplify and fix logging in ShutDown().

[Francois Gouget]

Don't log that the shutdown was successful if it failed or timed out.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/bin/LibvirtTool.pl | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index f14d54cd3b..db85f43e2f 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -290,10 +290,8 @@ sub ShutDown()
     return 1;
   }
 
-  Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey $CurrentSnapshot\n");
-  LogMsg "Performing a clean shutdown of $VMKey $CurrentSnapshot\n";
-
-  my $Success = 1;
+  Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n");
+  LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n";
   my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ?
             ["shutdown.exe", "/p", "/d", "00:00"] :
             ["/sbin/shutdown", "--poweroff", "now"];
@@ -302,28 +300,24 @@ sub ShutDown()
   if (!$PTA->Run($Cmd, 0))
   {
     Error "Could not run @$Cmd on $VMKey: ". $PTA->GetLastError() ."\n";
-    $Success = 0;
+    return 0;
   }
-  else
+
+  Debug(Elapsed($Start), " Waiting for the VM to shut down\n");
+  my $Deadline = time() + $WaitForShutdown;
+  while (time() <= $Deadline)
   {
-    Debug(Elapsed($Start), " Waiting for the VM to power off\n");
-    my $Deadline = time() + $WaitForShutdown;
-    while ($Domain->IsPoweredOn())
+    if (!$Domain->IsPoweredOn())
     {
-      if (time() >= $Deadline)
-      {
-        Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n";
-        $Success = 0;
-        last;
-      }
-      sleep(1);
+      Debug(Elapsed($Start), " Successfully shut down $VMKey\n");
+      LogMsg "Successfully shut down $VMKey\n";
+      return 1;
     }
+    sleep(1);
   }
-  $PTA->Disconnect();
+  Error "Timed out waiting for $VMKey to perform a clean shutdown. Forcefully shutting down now...\n";
 
-  Debug(Elapsed($Start), " Successfully shut down $VMKey\n");
-  LogMsg "Successfully shut down $VMKey\n";
-  return $Success;
+  return 0;
 }
 
 sub Monitor()
-- 
2.30.2

[tools 3/3] testbot/LibvirtTool: Avoid a race between shutdown.exe and TestAgentd.

[Francois Gouget]

"shutdown.exe /p" waits for no process which may give it a slight edge
in not getting stuck; but it also does not wait for TestAgentd to reply
to the Run() RPC.
"shutdown.exe /s" does not seem to have this problem (and supports /t if
need be).

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/bin/LibvirtTool.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index db85f43e2f..e2f2fd3c46 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -293,7 +293,7 @@ sub ShutDown()
   Debug(Elapsed($Start), " Performing a clean shutdown of $VMKey/$CurrentSnapshot\n");
   LogMsg "Performing a clean shutdown of $VMKey/$CurrentSnapshot\n";
   my $Cmd = $VM->Type =~ /^win(?:32|64)$/ ?
-            ["shutdown.exe", "/p", "/d", "00:00"] :
+            ["shutdown.exe", "/s", "/d", "00:00", "/t", "0"] :
             ["/sbin/shutdown", "--poweroff", "now"];
   Debug(Elapsed($Start), " Running @$Cmd\n");
   my $PTA = GetPrivilegedTA($VM->GetAgent());
-- 
2.30.2