cr-ensure-disk-space: Take the flights db lock

This eliminates the race with cs-bisection-step (and other
flight-construction tools which might reuse previous flights, provided
that they also do not pass previous flight numbers from hand to hand
with the db unlocked).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 8c5a708f334f894a1b48571c12f33725105a0069..138f3f4e5c5bc427d677ac33180d1db52eeb1988 100755 (executable)
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -145,10 +145,13 @@ END
     return 1;
 }
 
-for (;;) {
-    iteration_continue()
-       or last;
-}
+db_retry($dbh_tests,[qw(flights)], sub {
+    @flights = ();
+    for (;;) {
+       iteration_continue()
+           or last;
+    }
+});
 
 printf "ok.\n";
 exit 0;