* Add lockfile to expire.in

 * Run through the entire archive without a lock, then get a lock and
   start archiving bugs
 * Add lockpid functions

diff --git a/Debbugs/Common.pm b/Debbugs/Common.pm
index f88a2f475091a174c8a0d3d8de0591b55e5ba5a2..540db4cd551ab888b3e7444b5855ef899b3a091d 100644 (file)
--- a/Debbugs/Common.pm
+++ b/Debbugs/Common.pm
@@ -341,6 +341,38 @@ sub unfilelock {
         or warn "Unable to unlink lockfile $fl{file}: $!";
 }
 
+=head2 lockpid
+
+      lockpid('/path/to/pidfile');
+
+Creates a pidfile '/path/to/pidfile' if one doesn't exist or if the
+pid in the file does not respond to kill 0.
+
+Returns 1 on success, false on failure; dies on unusual errors.
+
+=cut
+
+sub lockpid {
+     my ($pidfile) = @_;
+     if (-e $pidfile) {
+         my $pidfh = IO::File->new($pidfile, 'r') or
+              die "Unable to open pidfile $pidfile: $!"
+         local $/;
+         my $pid = <$pidfh>;
+         ($pid) = $pid =~ /(\d+)/;
+         if (defined $pid and kill(0,$pid)) {
+              return 0;
+         }
+         close $pidfh;
+         unlink $pidfile or
+              die "Unable to unlink stale pidfile $pidfile $!";
+     }
+     my $pidfh = IO::File->new($pidfile), 'w' or
+         die "Unable to open $pidfile for writing: $!";
+     print {$pidfh} $$ or die "Unable to write to $pidfile $!";
+     close $pidfh or die "Unable to close $pidfile $!";
+     return 1;
+}
 
 
 =head1 QUIT

diff --git a/scripts/expire.in b/scripts/expire.in
index 0b0391dcc662f85556cd5454334135fe8c3b300b..24494a0cc9f8cd1f7796bc5007051b4ad06b35f2 100755 (executable)
--- a/scripts/expire.in
+++ b/scripts/expire.in
@@ -91,13 +91,26 @@ my $errors=0;
 our $exit_now = 0;
 $SIG{INT} = sub {$exit_now=1;};
 #process each bug (ie, status file)
-while (length($bug=shift(@list))) {
+my @bugs_to_archive = ();
+for my $bug (@list))) {
      # Weeeee.
      print "Examining $bug\n" if $verbose;
      next unless bug_archiveable(bug=>$bug);
+     push @bugs_to_archive,$bug;
+}
+
+# At this point we want to block control
+if (not lockpid($config{spool_dir}.'/lock/expire.pid')) {
+     exit 1;
+}
+# We'll also double check that the bug can be archived
+for my $bug (@bugs_to_archive) {
+     print "Reexamining $bug\n" if $verbose;
+     next unless bug_archiveable(bug=>$bug);
      print "Bug $bug can be archived: " if $verbose;
      eval {
-         bug_archive(bug=>$bug);
+         bug_archive(bug=>$bug,
+                    );
          print "archived.\n" if $verbose;
      };
      if ($@) {
@@ -107,5 +120,7 @@ while (length($bug=shift(@list))) {
      }
      last if $exit_now;
 }
+unlink($config{spool_dir}.'/lock/expire.pid')
+
 
 exit $errors;