[ARVADOS] created: 1.2.0-20-gc18142134

[Git user]

        at  c18142134ed78216dbddcc40c9954a2701d6086e (commit)


commit c18142134ed78216dbddcc40c9954a2701d6086e
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Aug 17 12:03:08 2018 -0400

    13973: Set priority of child container requests based on parent
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index dd3ff767d..4d3dde0a5 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -321,7 +321,13 @@ class ContainerRequest < ArvadosModel
     c = get_requesting_container()
     if !c.nil?
       self.requesting_container_uuid = c.uuid
-      self.priority = c.priority>0 ? 1 : 0
+      # Determine the priority of container request for the requesting
+      # container.
+      self.priority = ContainerRequest.
+            where('container_uuid=? and priority>0', self.requesting_container_uuid).
+            map do |cr|
+        cr.priority
+      end.max || 0
     end
   end
 

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


hooks/post-receive
--