show provenance

[arvados.git] / services / api / app / models / job.rb

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index e13446b4aecc80684f6bdc9a806b5feb3fc19679..bb67bda97aa6d6eb86d4012e412e0c42ddd5bf2d 100644 (file)
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -1,4 +1,4 @@
-class Job < OrvosModel
+class Job < ArvadosModel
   include AssignUuid
   include KindAndEtag
   include CommonApiTemplate
@@ -7,6 +7,7 @@ class Job < OrvosModel
   serialize :tasks_summary, Hash
   before_create :ensure_unique_submit_id
   before_create :ensure_script_version_is_commit
+  before_update :ensure_script_version_is_commit
 
   has_many :commit_ancestors, :foreign_key => :descendant, :primary_key => :script_version
 
@@ -20,14 +21,14 @@ class Job < OrvosModel
     t.add :script_parameters
     t.add :script_version
     t.add :cancelled_at
-    t.add :cancelled_by_client
-    t.add :cancelled_by_user
+    t.add :cancelled_by_client_uuid
+    t.add :cancelled_by_user_uuid
     t.add :started_at
     t.add :finished_at
     t.add :output
     t.add :success
     t.add :running
-    t.add :is_locked_by
+    t.add :is_locked_by_uuid
     t.add :log
     t.add :resource_limits
     t.add :tasks_summary
@@ -40,9 +41,21 @@ class Job < OrvosModel
                       running: false)
   end
 
+  def self.queue
+    self.where('started_at is ? and is_locked_by_uuid is ? and cancelled_at is ?',
+               nil, nil, nil).
+      order('priority desc, created_at')
+  end
+
   protected
 
   def ensure_script_version_is_commit
+    if self.is_locked_by_uuid and self.started_at
+      # Apparently client has already decided to go for it. This is
+      # needed to run a local job using a local working directory
+      # instead of a commit-ish.
+      return true
+    end
     sha1 = Commit.find_by_commit_ish(self.script_version) rescue nil
     if sha1
       self.script_version = sha1
@@ -65,8 +78,7 @@ class Job < OrvosModel
     self.script_parameters.values.each do |v|
       next unless v.is_a? String
       v.match(/^(([0-9a-f]{32})\b(\+[^,]+)?,?)*$/) do |locator|
-        bare_locator = locator[0].gsub(/\+[^,]+/,'')
-        deps[bare_locator] = true
+        deps[locator] = true
       end
     end
     deps.keys
@@ -101,8 +113,8 @@ class Job < OrvosModel
       elsif is_locked_by_was and is_locked_by_was != current_user.uuid
         logger.warn "User #{current_user.uuid} tried to steal lock on #{self.class.to_s} #{uuid_was} from #{is_locked_by_was}"
         false
-      elsif !is_locked_by.nil? and is_locked_by != current_user.uuid
-        logger.warn "User #{current_user.uuid} tried to lock #{self.class.to_s} #{uuid_was} with uuid #{is_locked_by}"
+      elsif !is_locked_by_uuid.nil? and is_locked_by_uuid != current_user.uuid
+        logger.warn "User #{current_user.uuid} tried to lock #{self.class.to_s} #{uuid_was} with uuid #{is_locked_by_uuid}"
         false
       else
         super