[Xen-devel] [OSSTEST PATCH 23/32] cr-ensure-disk-space: Operate locally entirely separately.

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

Run cr-ensure-disk-space separately for local and remote directories.

Ie, do the local deletion in its own run (so removing the anomalous
separate invocation).

This makes little difference if the two disks are of roughly similar
sizes.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 cr-ensure-disk-space |    4 ----
 cri-args-hostlists   |    1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cr-ensure-disk-space b/cr-ensure-disk-space
index 1defa6a..1064590 100755
--- a/cr-ensure-disk-space
+++ b/cr-ensure-disk-space
@@ -45,7 +45,6 @@ csreadconfig();
 open LOCK, "> $c{GlobalLockDir}/publish-lock" or die $!;
 flock LOCK, LOCK_EX or die $!;
 
-chdir $c{Logs} or die $c{Logs};
 $|=1;
 
 my $chkq= $dbh_tests->prepare("SELECT * FROM flights WHERE flight=?");
@@ -121,9 +120,6 @@ for (;;) {
              rm -rf $flight
 END
 
-    printf "local..";
-    $spawn->(qw(rm -rf), $flight);
-
     printf "done.\n";
 }
 
diff --git a/cri-args-hostlists b/cri-args-hostlists
index 11f01bd..04cd6be 100644
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -74,6 +74,7 @@ execute_flight () {
         rm -f abort
         check_stop_core ''
 
+        ./cr-ensure-disk-space Logs
         ./cr-ensure-disk-space LogsPublish
 
        export OSSTEST_RESOURCE_PREINFO="[$branch $2]"
-- 
1.7.10.4


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