From: Tom Clegg <tom@curoverse.com>
Date: Thu, 8 Sep 2016 20:14:22 +0000 (-0400)
Subject: 9898: Check previous state after obtaining row lock.
X-Git-Tag: 1.1.0~743^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5afa718bbfbe9cded6a852af216788629c3afc72?hp=c0650d1d845b08668445fa5245d0e532b38afb95

9898: Check previous state after obtaining row lock.
---

diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index ba169cc127..11040ff346 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -77,20 +77,20 @@ class Container < ArvadosModel
   end
 
   def lock
-    if self.state == Locked
-      raise AlreadyLockedError
-    end
     with_lock do
+      if self.state == Locked
+        raise AlreadyLockedError
+      end
       self.state = Locked
       self.save!
     end
   end
 
   def unlock
-    if self.state == Queued
-      raise InvalidStateTransitionError
-    end
     with_lock do
+      if self.state == Queued
+        raise InvalidStateTransitionError
+      end
       self.state = Queued
       self.save!
     end