[ARVADOS] updated: 1.1.4-381-g85c1320

[Git user]

Summary of changes:
 services/api/app/controllers/arvados/v1/containers_controller.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

       via  85c13201abf4a9f19dd112992a04fa65da63369c (commit)
      from  333a30289f47c22956bcb6a045d1cd4c797e22c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 85c13201abf4a9f19dd112992a04fa65da63369c
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Jun 8 15:05:12 2018 -0400

    13594: Remove table lock.
    
    refs #13594
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/api/app/controllers/arvados/v1/containers_controller.rb b/services/api/app/controllers/arvados/v1/containers_controller.rb
index fa29dbd..25cb003 100644
--- a/services/api/app/controllers/arvados/v1/containers_controller.rb
+++ b/services/api/app/controllers/arvados/v1/containers_controller.rb
@@ -21,11 +21,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

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


hooks/post-receive
--