Fixed - error handling during RBatch execution in executionMode = REDIS_WRITE_ATOMIC/REDIS_READ_ATOMIC

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

@@ -229,6 +229,7 @@ public class CommandBatchService extends CommandAsyncService {
             BatchPromise<R> batchPromise = (BatchPromise<R>) promise;
             RPromise<R> sentPromise = (RPromise<R>) batchPromise.getSentPromise();
             super.handleError(sentPromise, cause);
+            super.handleError(promise, cause);
             semaphore.release();
             return;
         }
@@ -462,6 +463,7 @@ public class CommandBatchService extends CommandAsyncService {
                                 return;
                             }
                             
+                            try {
                                 for (java.util.Map.Entry<MasterSlaveEntry, List<Object>> entry : future.getNow().entrySet()) {
                                     Entry commandEntry = commands.get(entry.getKey());
                                     Iterator<Object> resultIter = entry.getValue().iterator();
@@ -491,9 +493,11 @@ public class CommandBatchService extends CommandAsyncService {
                                         responses.add(entryResult);
                                     }
                                 }
-                            
                                 BatchResult<Object> result = new BatchResult<Object>(responses, syncedSlaves);
                                 resultPromise.trySuccess((R)result);
+                            } catch (Exception e) {
+                                resultPromise.tryFailure(e);
+                            }
                             
                             commands = null;
                         }

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

@@ -3,6 +3,7 @@ package org.redisson;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +29,7 @@ import org.redisson.api.RBatch;
 import org.redisson.api.RFuture;
 import org.redisson.api.RListAsync;
 import org.redisson.api.RMapAsync;
+import org.redisson.api.RMapCache;
 import org.redisson.api.RMapCacheAsync;
 import org.redisson.api.RScript;
 import org.redisson.api.RScript.Mode;
@@ -139,11 +141,16 @@ public class RedissonBatchTest extends BaseTest {
     @Test
     public void testWriteTimeout() {
         RBatch batch = redisson.createBatch(batchOptions);
-        for (int i = 0; i < 200000; i++) {
         RMapCacheAsync<String, String> map = batch.getMapCache("test");
-            map.putAsync("" + i, "" + i, 10, TimeUnit.SECONDS);
+        for (int i = 0; i < 200000; i++) {
+            RFuture<String> f = map.putAsync("" + i, "" + i, 5, TimeUnit.MINUTES);
+            if (batchOptions.getExecutionMode() == ExecutionMode.REDIS_WRITE_ATOMIC) {
+                f.syncUninterruptibly();
             }
+        }
+        
         batch.execute();
+        assertThat(redisson.getMapCache("test").size()).isEqualTo(200000);
     }
     
     @Test