Merge branch '8840-lock-job-record' closes #8840
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 31 Mar 2016 15:54:40 +0000 (11:54 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 31 Mar 2016 15:54:40 +0000 (11:54 -0400)
services/api/app/models/job.rb

index f49d3453e7eed21b8f1309d024cb47e83fc4f05c..0ed53535778335d11b2b12d3007058e9ad76adfc 100644 (file)
@@ -95,8 +95,7 @@ class Job < ArvadosModel
   end
 
   def lock locked_by_uuid
-    transaction do
-      self.reload
+    with_lock do
       unless self.state == Queued and self.is_locked_by_uuid.nil?
         raise AlreadyLockedError
       end