Changeset 165

Timestamp:

10/07/09 20:34:09 (7 weeks ago)

Author:

hachi

Message:

Add $job->declined and test for external locking.

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/TheSchwartz/Job.pm (modified) (4 diffs)
• lib/TheSchwartz/Worker.pm (modified) (1 diff)
• t/declined.t (added)

trunk/CHANGES

@@ +1 @@
+    - Add $job->declined method for workers to be able to decline handling
+      a job at this time.
+
 1.08 ()
     - Added $client->grab_and_work_on($handle) to securely work on a job 

trunk/MANIFEST

@@ -43 +43 @@
 t/coalesce.t
 t/dead-dbs.t
+t/declined.t
 t/empty-db.t
 t/evenly-distribute.t

trunk/lib/TheSchwartz/Job.pm

@@ -162 +162 @@
 }
 
+sub was_declined {
+    my $job = shift;
+    if (@_) {
+        $job->{__was_declined} = shift;
+    }
+    return $job->{__was_declined};
+}
+
+
 sub did_something {
     my $job = shift;
@@ -194 +203 @@
     }
     $job->_failed($msg, $ex_status, 0);
+}
+
+sub declined {
+    my ($job) = @_;
+    if ($job->did_something) {
+        $job->debug("can't call 'declined' on already finished job");
+        return 0;
+    }
+    $job->debug("job declined.  retry will be considered after lease is up at " . $job->grabbed_until);
+
+    $job->was_declined(1);
+
+    # we do nothing regarding the job's status
 }
 
@@ -444 +466 @@
 or loaded, setting whether it has to C<$value> first, if specified.
 
+=head2 C<$job-E<gt>was_declined()>
+
+Sets (if given an argument) and returns the value of the was_declined flag for
+a job object. See also C<$job-E<gt>declined()>
+
 =head2 C<$job-E<gt>debug( $msg )>
 
@@ -486 +513 @@
 as C<$exit_status> (or C<1>), and the job is removed from the queue.
 
+=head2 C<$job-E<gt>declined()>
+
+Report that the job has been declined for handling at this time, which means that
+the job will be retried after the next grabbed_until interval, and does not count
+against the max_retries count.
+
 =head2 C<$job-E<gt>replace_with( @jobs )>
 

trunk/lib/TheSchwartz/Worker.pm

@@ -30 +30 @@
         $res = $class->work($job);
     };
+    my $errstr = $@;
 
     my $cjob = $client->current_job;
-    if ($@) {
-        $job->debug("Eval failure: $@");
+    if ($errstr) {
+        $job->debug("Eval failure: $errstr");
         $cjob->failed($@);
     }
-    unless ($cjob->did_something) {
+    if (! $cjob->was_declined && ! $cjob->did_something) {
         $cjob->failed('Job did not explicitly complete, fail, or get replaced');
     }