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 5d520007d1ecd0926da3b38de3758a3c93c72f81..154e2724db2e2aeab745ad2a1219ef9371eb59b2 100644 (file)
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -3,7 +3,7 @@ class Job < ArvadosModel
   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
@@ -30,7 +30,7 @@ class Job < ArvadosModel
     t.add :running
     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
@@ -75,19 +75,25 @@ class Job < ArvadosModel
 
   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
@@ -105,14 +111,14 @@ class Job < ArvadosModel
         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_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}"