Changeset 221 for trunk/RebuildQueue

Timestamp:

04/05/07 20:12:37 (3 years ago)

Author:

bchoate

Message:

Updates to lock mechanism to prevent premature deletion of lock file.

Files:

• trunk/RebuildQueue/plugins/RebuildQueue/lib/RebuildQueue/Daemon.pm (modified) (4 diffs)

trunk/RebuildQueue/plugins/RebuildQueue/lib/RebuildQueue/Daemon.pm

@@ -309 +309 @@
     my $cfg = MT::ConfigMgr->instance;
 
-    # It's unwise to ignore locking for task manager; NoLocking should be
-    # limited to the DBM driver.
-    #if ($cfg->NoLocking) {
-    #    ## If the user doesn't want locking, don't try to lock anything.
-    #    ## Safe for tasks??
-    #    return sub { };
-    #}
-
     my $temp_dir = $cfg->TempDir;
     my $mt_dir = MT->instance->{mt_dir};
@@ -328 +320 @@
         my $hostname = Sys::Hostname::hostname();
         my $lock_tmp = $lock_name . '.' . $hostname;
-        my $max_lock_age = 60;    ## no. of seconds til we break the lock
         my $tries = 10;           ## no. of seconds to keep trying
         my $lock_fh = gensym();
@@ -341 +332 @@
                 ## link() failed, but the file exists--we got the lock.
                 $got_lock++; last;
-            } else {
-                ## Couldn't get a lock; if the lock is too old, break it.
-                my $lock_age = (stat $lock_name)[10];
-                unlink $lock_name if time - $lock_age > $max_lock_age;
             }
             sleep 1;
@@ -358 +345 @@
         my $lock_flags = LOCK_EX | LOCK_NB;
         unless (flock $lock_fh, $lock_flags) {
+            # Advisory lock is still active
             close $lock_fh;
-            unlink $lock_name;
             return;
         }