Francois Gouget : testbot: Switch CheckForWinetestUpdate.pl to the new job staging standard.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: aaa6ace37242d8986a5e4514a362bb7cad7d67ef
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=aaa6ace37242d8986a5e4514a362bb7cad7d67ef

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Thu Jun  7 00:31:53 2018 +0200

testbot: Switch CheckForWinetestUpdate.pl to the new job staging standard.

The new approach ensures there is no race condition with the TestBot
Engine between saving the job and saving the steps.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/bin/CheckForWinetestUpdate.pl | 46 ++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/testbot/bin/CheckForWinetestUpdate.pl b/testbot/bin/CheckForWinetestUpdate.pl
index 17dab82..137db57 100755
--- a/testbot/bin/CheckForWinetestUpdate.pl
+++ b/testbot/bin/CheckForWinetestUpdate.pl
@@ -192,15 +192,9 @@ sub AddJob($$$)
     return 1;
   }
 
-  # Create a hard link in staging so it can then be moved into the job
-  # directory. This is ok because the latest file is never overwritten.
-  my $StagingFileName = CreateNewLink("$DataDir/latest/$LatestBaseName",
-                                      "$DataDir/staging", "_$LatestBaseName");
-
   # First create a new job
   my $Jobs = CreateJobs();
   my $NewJob = $Jobs->Add();
-  $NewJob->Status("queued");
   $NewJob->User(GetBatchUser());
   $NewJob->Priority($BaseJob && $Bits == 32 ? 8 : 9);
   $NewJob->Remarks($Remarks);
@@ -210,9 +204,9 @@ sub AddJob($$$)
   my $NewStep = $Steps->Add();
   my $BitsSuffix = ($Bits == 64 ? "64" : "");
   $NewStep->Type("suite");
-  $NewStep->FileName(basename($StagingFileName));
+  $NewStep->FileName($LatestBaseName);
   $NewStep->FileType($Bits == 64 ? "exe64" : "exe32");
-  $NewStep->InStaging(1);
+  $NewStep->InStaging(!1);
 
   # Add a task for each VM
   my $Tasks = $NewStep->Tasks;
@@ -224,12 +218,28 @@ sub AddJob($$$)
     $Task->Timeout($SuiteTimeout);
   }
 
-  # Now save the whole thing
+  # Save it all
   my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save();
   if (defined $ErrMessage)
   {
-    Error "Failed to save job: $ErrMessage\n";
-    unlink($StagingFileName);
+    LogMsg "Failed to save the $LatestBaseName job: $ErrMessage\n";
+    return 0;
+  }
+
+  # Stage the test file so it can be picked up by the job
+  if (!link("$DataDir/latest/$LatestBaseName",
+            "$DataDir/staging/job". $NewJob->Id ."_$LatestBaseName"))
+  {
+    Error "Failed to stage $LatestBaseName: $!\n";
+    return 0;
+  }
+
+  # Switch Status to staging to indicate we are done setting up the job
+  $NewJob->Status("staging");
+  ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save();
+  if (defined $ErrMessage)
+  {
+    Error "Failed to save the $LatestBaseName job (staging): $ErrMessage\n";
     return 0;
   }
 
@@ -244,7 +254,6 @@ sub AddReconfigJob()
   # First create a new job
   my $Jobs = CreateJobs();
   my $NewJob = $Jobs->Add();
-  $NewJob->Status("queued");
   $NewJob->User(GetBatchUser());
   $NewJob->Priority(3);
   $NewJob->Remarks($Remarks);
@@ -266,11 +275,20 @@ sub AddReconfigJob()
   $Task->VM($BuildVM);
   $Task->Timeout($ReconfigTimeout);
 
-  # Now save the whole thing
+  # Save it all
   my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save();
   if (defined $ErrMessage)
   {
-    Error "Failed to save reconfig job: $ErrMessage\n";
+    Error "Failed to save the Reconfig job: $ErrMessage\n";
+    return 0;
+  }
+
+  # Switch Status to staging to indicate we are done setting up the job
+  $NewJob->Status("staging");
+  ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save();
+  if (defined $ErrMessage)
+  {
+    Error "Failed to save the Reconfig job (staging): $ErrMessage\n";
     return 0;
   }
 }