[Xen-devel] [OSSTEST PATCH 3/6] cs-bisection-step: Flail detection: look only at our blessing

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

When looking for identical previously flights, consider only ones
which have the same blessing as our prospective flight will have.

There are good reasons why apparently identical flights might appear
with other in-scope blessings: notably, a single-test-job main branch
might produce many failures from its push gate, which would all have
the main branch blessing (rather than the bisector's blessing).

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 cs-bisection-step |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/cs-bisection-step b/cs-bisection-step
index 4891e93..3035912 100755
--- a/cs-bisection-step
+++ b/cs-bisection-step
@@ -1230,7 +1230,10 @@ END
     # one side is NULL (runvar was missing) it still counts.
     my $equalflightsqt = <<END;
         SELECT flight, blessing, started FROM flights
-           WHERE branch=? AND $blessingscond $maxflight_cond
+           WHERE branch=?  $maxflight_cond
+              AND blessing = (
+               SELECT intended FROM flights WHERE flight = ?
+                )
              AND NOT EXISTS (
                SELECT 1
                  FROM $runvarsqt1 r1 FULL OUTER JOIN
@@ -1260,7 +1263,7 @@ END
         $minflight //= 0;
        print DEBUG "minflight=$minflight\n";
 
-       $equalflightsq->execute($branch, $popflight, $minflight);
+       $equalflightsq->execute($branch, $popflight, $popflight, $minflight);
        my $nequalflights = 0;
        my $explanation = '';
        while (my $identical = $equalflightsq->fetchrow_hashref()) {
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel