Merge branch '20183-update-priority-thread'

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

diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index e4da8399f27e7f8e84f4a1aed5c656f3e2c5f6e6..09da141eae67e3cab6f8d964f819d6fd26cad017 100644 (file)
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -200,7 +200,14 @@ class ContainerRequest < ArvadosModel
       end
 
       update_collections(container: container)
-
+      # update_collections makes a log collection that includes all of the logs
+      # for all of the containers associated with this request. For requests
+      # that are retried, this is the primary way users can get logs for
+      # failed containers.
+      # The code below makes a log collection that is a verbatim copy of the
+      # container's logs. This is required for container reuse: a container
+      # will not be reused if the owner cannot read a collection with its logs.
+      # See the "readable log" section of Container.find_reusable().
       if container.state == Container::Complete
         log_col = Collection.where(portable_data_hash: container.log).first
         if log_col
@@ -293,6 +300,10 @@ class ContainerRequest < ArvadosModel
     super - ["mounts", "secret_mounts", "secret_mounts_md5", "runtime_token", "output_storage_classes"]
   end
 
+  def set_priority_zero
+    self.update_attributes!(priority: 0) if self.priority > 0 && self.state != Final
+  end
+
   protected
 
   def fill_field_defaults
@@ -341,10 +352,11 @@ class ContainerRequest < ArvadosModel
       self.container_count += 1
       return if self.container_uuid_was.nil?
 
-      old_container = Container.find_by_uuid(self.container_uuid_was)
-      return if old_container.nil?
+      old_container_uuid = self.container_uuid_was
+      old_container_log = Container.where(uuid: old_container_uuid).pluck(:log).first
+      return if old_container_log.nil?
 
-      old_logs = Collection.where(portable_data_hash: old_container.log).first
+      old_logs = Collection.where(portable_data_hash: old_container_log).first
       return if old_logs.nil?
 
       log_coll = self.log_uuid.nil? ? nil : Collection.where(uuid: self.log_uuid).first
@@ -359,7 +371,7 @@ class ContainerRequest < ArvadosModel
       # copy logs from old container into CR's log collection
       src = Arv::Collection.new(old_logs.manifest_text)
       dst = Arv::Collection.new(log_coll.manifest_text)
-      dst.cp_r("./", "log for container #{old_container.uuid}", src)
+      dst.cp_r("./", "log for container #{old_container_uuid}", src)
       manifest = dst.manifest_text
 
       log_coll.assign_attributes(
@@ -557,10 +569,6 @@ class ContainerRequest < ArvadosModel
     end
   end
 
-  def set_priority_zero
-    self.update_attributes!(priority: 0) if self.state != Final
-  end
-
   def set_requesting_container_uuid
     if (self.requesting_container_uuid = get_requesting_container_uuid())
       # Determine the priority of container request for the requesting