X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8b366554a0dced3b9423a6fa0109f168a521de74..98969e546c909ac2ee4256934b5339080598d252:/services/api/app/models/container.rb

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 146cc16ec8..3c6c969bd2 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -131,7 +131,7 @@ class Container < ArvadosModel
   def update_priority!
     return if ![Queued, Locked, Running].include?(state)
     p = ContainerRequest.
-          where('container_uuid=? and priority>0', uuid).
+          where('container_uuid=? and priority>0 and state=?', uuid, ContainerRequest::Committed).
           select("priority, requesting_container_uuid, created_at").
           lock(true).
           map do |cr|
@@ -831,7 +831,7 @@ class Container < ArvadosModel
           ContainerRequest.
             where(requesting_container_uuid: uuid,
                   state: ContainerRequest::Committed).
-            in_batches(of: 15).each do |cr|
+            in_batches(of: 15).each_record do |cr|
             leave_modified_by_user_alone do
               cr.set_priority_zero
               container_state = Container.where(uuid: cr.container_uuid).pluck(:state).first