Deadlock inside tx was fixed

orientechnologies · Feb 27, 2020 · fe12748 · fe12748
1 parent 945765b
commit fe12748
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...s/orient/core/storage/impl/local/paginated/atomicoperations/OAtomicOperationsManager.java b/...s/orient/core/storage/impl/local/paginated/atomicoperations/OAtomicOperationsManager.java
@@ -261,10 +261,9 @@ public static OAtomicOperation getCurrentOperation() {
   }
 
   private void startComponentOperation(final OAtomicOperation atomicOperation, final String lockName) {
-    acquireExclusiveLockTillOperationComplete(atomicOperation, lockName);
     checkReadOnlyConditions(atomicOperation);
-
     componentOperationsFreezer.startOperation();
+    acquireExclusiveLockTillOperationComplete(atomicOperation, lockName);
   }
 
   private void endComponentOperation() {
@@ -280,14 +279,15 @@ public void releaseComponentOperations(final long freezeId) {
   }
 
   private boolean tryStartComponentOperation(final OAtomicOperation atomicOperation, final String lockName) {
+    checkReadOnlyConditions(atomicOperation);
+    componentOperationsFreezer.startOperation();
+
     final boolean result = tryAcquireExclusiveLockTillOperationComplete(atomicOperation, lockName);
     if (!result) {
+      componentOperationsFreezer.endOperation();
       return false;
     }
 
-    checkReadOnlyConditions(atomicOperation);
-
-    componentOperationsFreezer.startOperation();
     return true;
   }