ISPN-11157 Optimistic Transaction ignores ZERO_LOCK_ACQUISITION flag

infinispan · Jan 17, 2020 · 49c2c54 · 49c2c54
1 parent df6dc33
commit 49c2c54
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java b/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
@@ -189,7 +189,16 @@ public Object getKeyLockOwner() {
 
    @Override
    public boolean hasZeroLockAcquisition() {
-      return false;
+      if (modifications == null || modifications.length == 0) {
+         return false;
+      }
+      for (WriteCommand wc : modifications) {
+         // If even a single command doesn't have the zero lock acquisition timeout flag, we can't use a zero timeout
+         if (!wc.hasAnyFlag(FlagBitSets.ZERO_LOCK_ACQUISITION_TIMEOUT)) {
+            return false;
+         }
+      }
+      return true;
    }
 
    @Override

diff --git a/core/src/main/java/org/infinispan/interceptors/locking/OptimisticLockingInterceptor.java b/core/src/main/java/org/infinispan/interceptors/locking/OptimisticLockingInterceptor.java
@@ -45,7 +45,8 @@ public Object visitPrepareCommand(TxInvocationContext ctx, PrepareCommand comman
             // However, keep the backup locks if the prepare command is being replayed because of state transfer
             ctx.getCacheTransaction().cleanupBackupLocks();
          }
-         lockStage = lockAllOrRegisterBackupLock(ctx, command, keysToLock, cacheConfiguration.locking().lockAcquisitionTimeout());
+         lockStage = lockAllOrRegisterBackupLock(ctx, command, keysToLock, command.hasZeroLockAcquisition() ? 0 :
+               cacheConfiguration.locking().lockAcquisitionTimeout());
       }
 
       if (command.isOnePhaseCommit()) {