]> xenbits.xensource.com Git - osstest.git/commitdiff
host reuse: Use literal for the hosts_infraprioritygroup runvar
authorIan Jackson <ian.jackson@eu.citrix.com>
Mon, 24 Aug 2020 11:03:11 +0000 (12:03 +0100)
committerIan Jackson <iwj@xenproject.org>
Wed, 7 Oct 2020 16:48:33 +0000 (17:48 +0100)
At some point this might make the database smarter about indexing.
It's certainly clearer.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Osstest/JobDB/Executive.pm

index 8c235d454ed4a0c4cd56fc4258aa81d099e834d9..8fde2934cf1915d136569ef079d9d9977f1b54b8 100644 (file)
@@ -403,19 +403,19 @@ sub jobdb_set_hosts_infraprioritygroup ($$$$;$) { # method
                (job = ?) AS thisjob
           FROM runvars
          WHERE flight=?
-           AND name=?
+           AND name='$vn'
       ORDER BY thisjob DESC
 END
     my $insertq = $dbh_tests->prepare(<<END);
-        INSERT INTO runvars (flight,job, name,val, synth)
-                     VALUES (?,     ?,   ?,   ?,   't')
+        INSERT INTO runvars (flight,job, name,  val, synth)
+                     VALUES (?,     ?,   '$vn', ?,   't')
 END
 
     my $resulting;
     db_retry($dbh_tests,[],sub {
        my $use = 1;
        $resulting = undef;
-        $queryq->execute($job, $flight, $vn);
+        $queryq->execute($job, $flight);
        while (my ($tjob, $tval, $thisjob) = $queryq->fetchrow_array()) {
            if ($thisjob) {
                logm("$vn: job is already in group $tval");
@@ -431,7 +431,7 @@ END
        }
        $resulting = "$use:$group_key";
        logm("$vn: inserting job into group $resulting");
-       $insertq->execute($flight,$job,$vn, $resulting);
+       $insertq->execute($flight,$job, $resulting);
     });
     $rref->{$vn} = $resulting if $rref && defined $resulting;
 }