]> xenbits.xensource.com Git - people/aperard/osstest.git/commitdiff
ts-hosts-allocate-Executive: Move $prevfail_bonus initial setting
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 25 May 2017 11:47:05 +0000 (12:47 +0100)
committerIan Jackson <ian.jackson@eu.citrix.com>
Thu, 1 Jun 2017 10:26:49 +0000 (11:26 +0100)
No functional change.  This is going to make the next patch easy.

Reported-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
ts-hosts-allocate-Executive

index 9955cbadd73f046d9bd6a7f5355998ddb196436a..82ef6285ea671118b6010066b1a40cfd18ba2155 100755 (executable)
@@ -618,6 +618,8 @@ sub hid_recurse ($$) {
 
     $duration_rightaway_adjust=0 if $start_time;
 
+    my $prevfail_bonus = $r{hostalloc_bonus_previousfail};
+
     my $duration_for_cost = 0;
     if ($jobinfo->{recipe} =~ m/build/) {
         $variation_age= 0;
@@ -630,7 +632,7 @@ sub hid_recurse ($$) {
     $variation_bonus=$max_variation_bonus
        if $variation_bonus>$max_variation_bonus;
 
-    my $prevfail_bonus = $r{hostalloc_bonus_previousfail} // 7.0*86400;
+    $prevfail_bonus //= 7.0*86400;
     my $prevfail_equiv_bonus = $prevfail_bonus * (6.5 / 7.0);
 
     my $share_reuse_bonus = $r{hostalloc_bonus_sharereuse} // 10000;