From b4cc6f994149a5072a18ed94b65a7a99ec4fe76a Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 14 Dec 2017 18:03:45 +0300
Subject: [PATCH] Fixed - RedissonRedLock couldn't be locked in some cases.
 #1175

---
 .../java/org/redisson/RedissonMultiLock.java  | 20 +++++++++++------
 .../org/redisson/RedissonRedLockTest.java     | 22 ++++++++++++-------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonMultiLock.java b/redisson/src/main/java/org/redisson/RedissonMultiLock.java
index 32b980ab2..9b71ce63d 100644
--- a/redisson/src/main/java/org/redisson/RedissonMultiLock.java
+++ b/redisson/src/main/java/org/redisson/RedissonMultiLock.java
@@ -75,18 +75,19 @@ public class RedissonMultiLock implements Lock {
     }
 
     public void lockInterruptibly(long leaseTime, TimeUnit unit) throws InterruptedException {
+        long baseWaitTime = locks.size() * 1500;
         long waitTime = -1;
         if (leaseTime == -1) {
-            waitTime = 5;
-            unit = TimeUnit.SECONDS;
+            waitTime = baseWaitTime;
+            unit = TimeUnit.MILLISECONDS;
         } else {
             waitTime = unit.toMillis(leaseTime);
             if (waitTime <= 2000) {
                 waitTime = 2000;
-            } else if (waitTime <= 5000) {
+            } else if (waitTime <= baseWaitTime) {
                 waitTime = ThreadLocalRandom.current().nextLong(waitTime/2, waitTime);
             } else {
-                waitTime = ThreadLocalRandom.current().nextLong(5000, waitTime);
+                waitTime = ThreadLocalRandom.current().nextLong(baseWaitTime, waitTime);
             }
             waitTime = unit.convert(waitTime, TimeUnit.MILLISECONDS);
         }
@@ -131,7 +132,7 @@ public class RedissonMultiLock implements Lock {
     public boolean tryLock(long waitTime, long leaseTime, TimeUnit unit) throws InterruptedException {
         long newLeaseTime = -1;
         if (leaseTime != -1) {
-            newLeaseTime = waitTime*2;
+            newLeaseTime = unit.toMillis(waitTime)*2;
         }
         
         long time = System.currentTimeMillis();
@@ -139,6 +140,8 @@ public class RedissonMultiLock implements Lock {
         if (waitTime != -1) {
             remainTime = unit.toMillis(waitTime);
         }
+        long lockWaitTime = calcLockWaitTime(remainTime);
+        
         int failedLocksLimit = failedLocksLimit();
         List<RLock> lockedLocks = new ArrayList<RLock>(locks.size());
         for (ListIterator<RLock> iterator = locks.listIterator(); iterator.hasNext();) {
@@ -148,8 +151,8 @@ public class RedissonMultiLock implements Lock {
                 if (waitTime == -1 && leaseTime == -1) {
                     lockAcquired = lock.tryLock();
                 } else {
-                    long awaitTime = unit.convert(remainTime, TimeUnit.MILLISECONDS);
-                    lockAcquired = lock.tryLock(awaitTime, newLeaseTime, unit);
+                    long awaitTime = Math.min(lockWaitTime, remainTime);
+                    lockAcquired = lock.tryLock(awaitTime, newLeaseTime, TimeUnit.MILLISECONDS);
                 }
             } catch (Exception e) {
                 lockAcquired = false;
@@ -203,6 +206,9 @@ public class RedissonMultiLock implements Lock {
         return true;
     }
 
+    protected long calcLockWaitTime(long remainTime) {
+        return remainTime;
+    }
 
     @Override
     public void unlock() {
diff --git a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
index 8c15c20c0..4edc65c77 100644
--- a/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonRedLockTest.java
@@ -170,9 +170,21 @@ public class RedissonRedLockTest {
         RLock lock2 = client1.getLock("lock2");
         RLock lock3 = client2.getLock("lock3");
         
+        testLock(lock1, lock2, lock3, lock1);
+        testLock(lock1, lock2, lock3, lock2);
+        testLock(lock1, lock2, lock3, lock3);
+        
+        client1.shutdown();
+        client2.shutdown();
+        
+        assertThat(redis1.stop()).isEqualTo(0);
+        assertThat(redis2.stop()).isEqualTo(0);
+    }
+
+    protected void testLock(RLock lock1, RLock lock2, RLock lock3, RLock lockFirst) throws InterruptedException {
         Thread t1 = new Thread() {
             public void run() {
-                lock3.lock();
+                lockFirst.lock();
             };
         };
         t1.start();
@@ -193,17 +205,11 @@ public class RedissonRedLockTest {
         t.start();
         t.join(1000);
 
-        lock3.delete();
+        lockFirst.delete();
         
         RedissonMultiLock lock = new RedissonRedLock(lock1, lock2, lock3);
         lock.lock();
         lock.unlock();
-        
-        client1.shutdown();
-        client2.shutdown();
-        
-        assertThat(redis1.stop()).isEqualTo(0);
-        assertThat(redis2.stop()).isEqualTo(0);
     }