From ece80f363342c698fe5f4575ae8149a513165aa2 Mon Sep 17 00:00:00 2001
From: wuqian30624 <wuqian0808@me.com>
Date: Mon, 2 Nov 2020 11:39:10 +0800
Subject: [PATCH] Add testcase

Signed-off-by: wuqian30624 <wuqian0808@me.com>
---
 .../java/org/redisson/RedissonFairLock.java   |  2 +-
 .../org/redisson/RedissonFairLockTest.java    | 57 +++++++++++++++++++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/RedissonFairLock.java b/redisson/src/main/java/org/redisson/RedissonFairLock.java
index b3a0f2520..b6f973efc 100644
--- a/redisson/src/main/java/org/redisson/RedissonFairLock.java
+++ b/redisson/src/main/java/org/redisson/RedissonFairLock.java
@@ -212,7 +212,7 @@ public class RedissonFairLock extends RedissonLock implements RLock {
                         "if (timeout > tonumber(ARGV[4])) and (redis.call('exists', KEYS[1]) == 0) then " +
                             "redis.call('lpop', KEYS[2]);" +
                             "redis.call('zrem', KEYS[3], firstThreadId);" +
-                        "else" +
+                        "else " +
                             "break;" +
                         "end;" +
                     "end;" +
diff --git a/redisson/src/test/java/org/redisson/RedissonFairLockTest.java b/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
index 922ee84d7..a613d5604 100644
--- a/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
+++ b/redisson/src/test/java/org/redisson/RedissonFairLockTest.java
@@ -933,5 +933,62 @@ public class RedissonFairLockTest extends BaseConcurrentTest {
         await().atMost(30, TimeUnit.SECONDS).until(() -> lockedCounter.get() == totalThreads);
     }
 
+    @Test
+    public void testLockBlock() throws InterruptedException{
+        Config cfg = createConfig();
+        cfg.useSingleServer().setSubscriptionsPerConnection(100);
+        RedissonClient redisson = Redisson.create(cfg);
+
+        int totalExecutorCount = 5;
+        int totalThreadCount = 100;
+        int interval = 1000;
+        Lock lock = redisson.getFairLock("testLockBlock");
+        for (int count = 0; count < totalExecutorCount; count++) {
+            ExecutorService executor = Executors.newFixedThreadPool(totalThreadCount);
+            for (int i = 0; i < totalThreadCount; i++) {
+                final int finalI = i;
+                executor.submit(() -> {
+                    log.info("running " + finalI + " in thread " + Thread.currentThread().getId());
+                    try {
+                        lock.lock();
+                        log.info("Thread " + finalI + " got lock");
+                    } catch (Exception ex) {
+                        log.error("Failed to get lock");
+                    } finally {
+                        lock.unlock();
+                    }
+                });
+            }
+            executor.shutdownNow();
+        }
+        redisson.shutdown();
 
+        // In case connection closed
+        redisson = Redisson.create(cfg);
+        long timeOut = redisson.getConfig().getLockWatchdogTimeout() + interval;
+        ExecutorService lockExecutor = Executors.newFixedThreadPool(1);
+        Lock lockSecond = redisson.getFairLock("testLockBlock");
+        Future<Boolean> future = lockExecutor.submit(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                // check if this lock can be acquired in short time
+                Thread.sleep(timeOut);
+                lockSecond.lock();
+                return Boolean.TRUE;
+            }
+        });
+
+        Boolean got = Boolean.FALSE;
+        try{
+            got = future.get(timeOut + interval, TimeUnit.MILLISECONDS);
+            if (got) {
+                log.info("Got lock immediately after startup");
+            }else{
+                log.info("Failed to get lock due to blocked");
+            }
+        }catch (Exception e){
+            log.info("Failed to get lock due to blocked");
+        }
+        Assert.assertTrue(got);
+    }
 }