@@ -1148,7 +1148,8 @@ END
# to allow for slow jobs, compared to other jobs
# W number of jobs waiting - strictly, jobs in states
# preparing queued running
-# D number of jobs done - strictly, other states
+# D number of jobs done - strictly, jobs in states
+# pass fail
# tuning parameters:
# Xt X when D=9 W=1, ie cancel one job out of ten
# Xh X when D=1 W=1, ie cancel one job out of two
@@ -846,11 +846,14 @@ sub starving ($$$) {
# is indistinguishable from a flight which is at the head
# of the queue for a small set of resources.
return (0, "job $j status $st, don't give up just yet");
- } else {
+ } elsif ($st eq 'pass' ||
+ $st eq 'fail') {
$d++;
return (0, "job $j status $st but no step finished time!")
unless defined $fin;
$maxfin = $fin if $fin > $maxfin;
+ } else {
+ # disregard - neither W or D
}
}
# we quit if the total time from the start of the flight
The main effect is to treat "broken" and "blocked" jobs as not part of the flight for starvation calculations. This is correct for commissioning flights and OK for other flights. Signed-off-by: Ian Jackson <iwj@xenproject.org> Release-Acked-by: Ian Jackson <iwj@xenproject.org> --- Osstest/Executive.pm | 3 ++- ts-hosts-allocate-Executive | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)