Fixed - Redisson shutdown takes much time after RBatch execution #3653

redisson/src/main/java/org/redisson/command/RedisQueuedBatchExecutor.java

@@ -78,11 +78,11 @@ public class RedisQueuedBatchExecutor<V, R> extends BaseRedisBatchExecutor<V, R>
     
     @Override
     protected void releaseConnection(RPromise<R> attemptPromise, RFuture<RedisConnection> connectionFuture) {
-        if (RedisCommands.EXEC.getName().equals(command.getName())) {
-            super.releaseConnection(attemptPromise, connectionFuture);
-        }
-        if (RedisCommands.DISCARD.getName().equals(command.getName())) {
+        if (RedisCommands.EXEC.getName().equals(command.getName())
+                || RedisCommands.DISCARD.getName().equals(command.getName())) {
             super.releaseConnection(attemptPromise, connectionFuture);
+        } else {
+            connectionManager.getShutdownLatch().release();
         }
     }
     
@@ -95,17 +95,13 @@ public class RedisQueuedBatchExecutor<V, R> extends BaseRedisBatchExecutor<V, R>
         }
         if (RedisCommands.DISCARD.getName().equals(command.getName())) {
             super.handleSuccess(promise, connectionFuture, null);
-            if (executed.compareAndSet(false, true)) {
-                connectionFuture.getNow().forceFastReconnectAsync().onComplete((r, e) -> {
-                    releaseConnection(promise, connectionFuture);
-                });
-            }
             return;
         }
 
         try {
             BatchPromise<R> batchPromise = (BatchPromise<R>) promise;
             RPromise<R> sentPromise = (RPromise<R>) batchPromise.getSentPromise();
+            System.out.println("res " + res);
             super.handleSuccess(sentPromise, connectionFuture, null);
         } finally {
             latch.countDown();

redisson/src/test/java/org/redisson/RedissonBatchTest.java

@@ -556,10 +556,24 @@ public class RedissonBatchTest extends BaseTest {
         
         redisson.shutdown();
     }
-    
+
     @ParameterizedTest
-@MethodSource("data")
+    @MethodSource("data")
+    public void testShutdownTimeout(BatchOptions batchOptions) {
+        org.junit.jupiter.api.Assertions.assertTimeout(Duration.ofMillis(500), () -> {
+            RedissonClient redisson = createInstance();
+
+            RBatch batch = redisson.createBatch(batchOptions);
+            for (int i = 0; i < 10; i++) {
+                RFuture<Void> f = batch.getBucket("test").setAsync(123);
+            }
+            batch.execute();
+            redisson.shutdown();
+        });
+    }
 
+    @ParameterizedTest
+    @MethodSource("data")
     public void testBatchBigRequest(BatchOptions batchOptions) {
         Config config = createConfig();
         config.useSingleServer().setTimeout(15000);