git-cache-proxy: housekeeping: check errno value from stat after deletion

[chiark-utils.git] / scripts / git-cache-proxy

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 334f509c5452d57a4dba00a42eebe8f1399a773f..b0c9502f8554b8f3f15345f784a624aa5dd6b10f 100755 (executable)
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -405,22 +405,33 @@ sub housekeeping () {
            next;
        }
        logm 'info', "housekeeping: subdirs $subdir: cleaning";
            next;
        }
        logm 'info', "housekeeping: subdirs $subdir: cleaning";

-       my $ok = 1;
-       foreach my $suffix (qw(tmp git)) {
-           my $dir = "${subdir}\\.$suffix";
-           my $errs;
-           remove_tree($dir, { safe=>1, error=>\$errs });
-           if (stat $dir) {
-               $ok = 0;
-               logm 'warning', "housekeeping: $dir: problems with".
-                   " deletion prevent cleanup:";
-               foreach my $err (@$errs) {
-                   my ($file, $message) = %$err;
-                   logm 'info', "problem deleting: $file: $message";
+       eval {
+           foreach my $suffix (qw(tmp git)) {
+               my $dir = "${subdir}\\.$suffix";
+               my $tdir = "${subdir}\\.tmp";
+               if ($dir ne $tdir) {
+                   if (!rename $dir,$tdir) {
+                       next if $! == ENOENT;
+                       die "$dir: cannot rename to $tdir: $!\n";
+                   }
+               }
+               my $errs;
+               remove_tree($tdir, { safe=>1, error=>\$errs });
+               if (!stat $tdir) {
+                   foreach my $err (@$errs) {
+                       my ($file, $message) = %$err;
+                       logm 'info', "problem deleting: $file: $message";
+                   }
+                   die "$dir: problem deleting file(s)\n";
+               } elsif ($! != ENOENT) {
+                   die "$tdir: cannot stat after deletion: $!\n";

                }
            }
                }
            }

-       }
-       if ($ok) {
+       };
+       if (length $@) {
+           chomp $@;
+           logm 'warning', "housekeeping: $subdir: cleanup prevented: $@";
+       } else {

            unlink $lock or hkfail "remove $lock: $!";
        }
     }
            unlink $lock or hkfail "remove $lock: $!";
        }
     }