rename jobs.resource_limits to runtime_constraints

[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..154e2724db2e2aeab745ad2a1219ef9371eb59b2 100644 (file)
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -1,12 +1,13 @@
-class Job < OrvosModel
+class Job < ArvadosModel
   include AssignUuid
   include KindAndEtag
   include CommonApiTemplate
   serialize :script_parameters, Hash
-  serialize :resource_limits, Hash
+  serialize :runtime_constraints, Hash
   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,16 +21,16 @@ 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 :runtime_constraints
     t.add :tasks_summary
     t.add :dependencies
   end
@@ -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
@@ -62,19 +75,25 @@ class Job < OrvosModel
 
   def dependencies
     deps = {}
-    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
+    queue = self.script_parameters.values
+    while not queue.empty?
+      queue = queue.flatten.compact.collect do |v|
+        if v.is_a? Hash
+          v.values
+        elsif v.is_a? String
+          v.match(/^(([0-9a-f]{32})\b(\+[^,]+)?,?)*$/) do |locator|
+            deps[locator.to_s] = true
+          end
+          nil
+        end
       end
     end
     deps.keys
   end
 
   def permission_to_update
-    if is_locked_by_was and !(current_user and
-                              current_user.uuid == is_locked_by_was)
+    if is_locked_by_uuid_was and !(current_user and
+                                   current_user.uuid == is_locked_by_uuid_was)
       if script_changed? or
           script_parameters_changed? or
           script_version_changed? or
@@ -92,17 +111,17 @@ class Job < OrvosModel
         return false
       end
     end
-    if !is_locked_by_changed?
+    if !is_locked_by_uuid_changed?
       super
     else
       if !current_user
         logger.warn "Anonymous user tried to change lock on #{self.class.to_s} #{uuid_was}"
         false
-      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}"
+      elsif is_locked_by_uuid_was and is_locked_by_uuid_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_uuid_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