From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 31 Mar 2016 15:54:40 +0000 (-0400)
Subject: Merge branch '8840-lock-job-record' closes #8840
X-Git-Tag: 1.1.0~1021
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c020dd4470a5f8cbcfe15e764553622828f69ab5?hp=cdcddca613c896fd8395a4045c858945451c3fa0

Merge branch '8840-lock-job-record' closes #8840
---

diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb
index f49d3453e7..0ed5353577 100644
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@ -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