X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8afc85aabb9563da4de17b0b5f7d4fe574e9ad8d..652e26feea271a3d86430cd494503ff96e11dc9f:/services/api/app/controllers/arvados/v1/containers_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/containers_controller.rb b/services/api/app/controllers/arvados/v1/containers_controller.rb
index fa29dbd813..65d8385ad5 100644
--- a/services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/services/api/app/controllers/arvados/v1/containers_controller.rb
@@ -6,6 +6,7 @@ class Arvados::V1::ContainersController < ApplicationController
   accept_attribute_as_json :environment, Hash
   accept_attribute_as_json :mounts, Hash
   accept_attribute_as_json :runtime_constraints, Hash
+  accept_attribute_as_json :runtime_status, Hash
   accept_attribute_as_json :command, Array
   accept_attribute_as_json :scheduling_parameters, Hash
 
@@ -21,11 +22,7 @@ class Arvados::V1::ContainersController < ApplicationController
   end
 
   def update
-    # container updates can trigger container request lookups, which
-    # can deadlock if we don't lock the container_requests table
-    # first.
-    @object.transaction do
-      ActiveRecord::Base.connection.execute('LOCK container_requests, containers IN EXCLUSIVE MODE')
+    @object.with_lock do
       @object.reload
       super
     end