[ARVADOS] updated: 9dca897db16ac33730fcf98c03513dd2b71b6017

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/job.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  9dca897db16ac33730fcf98c03513dd2b71b6017 (commit)
      from  77a5add94de54add033b9bd4d2c32f020fa7c63f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 9dca897db16ac33730fcf98c03513dd2b71b6017
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Sep 22 11:49:30 2014 -0400

    Jobs that are not started, not cancelled, and locked should be marked Failed.
    
    refs #3898

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index dc8f338..f8d5ed4 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -328,8 +328,11 @@ class Job < ArvadosModel
         self.state = Failed
       elsif (self.running && self.success.nil? && !self.cancelled_at)
         self.state = Running
-      elsif !self.started_at && !self.cancelled_at && self.success.nil?
+      elsif !self.started_at && !self.cancelled_at && !self.is_locked_by_uuid && self.success.nil?
         self.state = Queued
+      elsif !self.started_at && !self.cancelled_at && self.is_locked_by_uuid
+        # race condition for jobs that have just been grabbed by crunch-dispatch but haven't been marked as started yet...
+        self.state = Failed
       end
     end
  

-----------------------------------------------------------------------


hooks/post-receive
--