[ARVADOS] created: 77a5add94de54add033b9bd4d2c32f020fa7c63f

[git at public.curoverse.com]

        at  77a5add94de54add033b9bd4d2c32f020fa7c63f (commit)


commit 77a5add94de54add033b9bd4d2c32f020fa7c63f
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Sep 19 22:28:37 2014 -0400

    Bugfix: do not try to overwrite docker_image_locator if it is already set.
    
    refs #3898

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index ad7e9fa..dc8f338 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -134,6 +134,8 @@ class Job < ArvadosModel
   end
 
   def find_docker_image_locator
+    # Do nothing if docker_image_locator is already set
+    return true if not self.docker_image_locator.nil?
     # Find the Collection that holds the Docker image specified in the
     # runtime constraints, and store its locator in docker_image_locator.
     unless runtime_constraints.is_a? Hash

commit 68b07b79a04e43ac965b6f763f9e7edc9b59815c
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Sep 19 22:27:00 2014 -0400

    Extra job state:
    
      not started, not cancelled, not locked, not successful -> Queued
    
    refs #3898

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 7c06106..ad7e9fa 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -326,7 +326,7 @@ 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.is_locked_by_uuid && self.success.nil?
+      elsif !self.started_at && !self.cancelled_at && self.success.nil?
         self.state = Queued
       end
     end

commit e8c3c3b8b86d3cbfef0b617280182cb517b8a664
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Sep 19 22:25:13 2014 -0400

    Extra possible job state:
    
      not cancelled, not successful, but finished_at is set -> Failed
    
    refs #3898

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index 12f82be..7c06106 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -322,6 +322,8 @@ class Job < ArvadosModel
         self.state = Complete
       elsif (!self.success.nil? && !self.success)
         self.state = Failed
+      elsif self.finished_at && self.success.nil?
+        self.state = Failed
       elsif (self.running && self.success.nil? && !self.cancelled_at)
         self.state = Running
       elsif !self.started_at && !self.cancelled_at && !self.is_locked_by_uuid && self.success.nil?

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


hooks/post-receive
--