Support EXECABORT Error (#2598)

src/main/java/redis/clients/jedis/Protocol.java

@@ -21,6 +21,7 @@ public final class Protocol {
   private static final String NOSCRIPT_PREFIX = "NOSCRIPT ";
   private static final String WRONGPASS_PREFIX = "WRONGPASS";
   private static final String NOPERM_PREFIX = "NOPERM";
+  private static final String EXECABORT_PREFIX = "EXECABORT ";
 
   public static final String DEFAULT_HOST = "localhost";
   public static final int DEFAULT_PORT = 6379;
@@ -131,6 +132,8 @@ private static void processError(final RedisInputStream is) {
       throw new JedisAccessControlException(message);
     } else if (message.startsWith(NOPERM_PREFIX)) {
       throw new JedisAccessControlException(message);
+    } else if (message.startsWith(EXECABORT_PREFIX)) {
+      throw new AbortedTransactionException(message);
     }
     throw new JedisDataException(message);
   }

src/main/java/redis/clients/jedis/exceptions/AbortedTransactionException.java

@@ -0,0 +1,16 @@
+package redis.clients.jedis.exceptions;
+
+public class AbortedTransactionException extends JedisDataException {
+
+  public AbortedTransactionException(final String message) {
+    super(message);
+  }
+
+  public AbortedTransactionException(final Throwable cause) {
+    super(cause);
+  }
+
+  public AbortedTransactionException(final String message, final Throwable cause) {
+    super(message, cause);
+  }
+}

src/test/java/redis/clients/jedis/tests/ExceptionsTest.java

@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -20,6 +21,33 @@ public static void prepare() {
     CAUSE = new Throwable("This is a test cause.");
   }
 
+  @Test
+  public void abortedTransaction() {
+    try {
+      throw new AbortedTransactionException(MESSAGE);
+    } catch (Exception e) {
+      assertSame(AbortedTransactionException.class, e.getClass());
+      assertEquals(MESSAGE, e.getMessage());
+      assertNull(e.getCause());
+    }
+
+    try {
+      throw new AbortedTransactionException(CAUSE);
+    } catch (Exception e) {
+      assertSame(AbortedTransactionException.class, e.getClass());
+      assertEquals(CAUSE, e.getCause());
+      assertEquals(CAUSE.toString(), e.getMessage());
+    }
+
+    try {
+      throw new AbortedTransactionException(MESSAGE, CAUSE);
+    } catch (Exception e) {
+      assertSame(AbortedTransactionException.class, e.getClass());
+      assertEquals(MESSAGE, e.getMessage());
+      assertEquals(CAUSE, e.getCause());
+    }
+  }
+
   @Test
   public void invalidURI() {
     try {

src/test/java/redis/clients/jedis/tests/PipeliningTest.java

@@ -6,6 +6,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -22,24 +23,19 @@
 
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matcher;
-import org.junit.After;
 import org.junit.Test;
 
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.Pipeline;
 import redis.clients.jedis.Response;
 import redis.clients.jedis.Tuple;
+import redis.clients.jedis.exceptions.AbortedTransactionException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.tests.commands.JedisCommandTestBase;
 import redis.clients.jedis.util.SafeEncoder;
 
 public class PipeliningTest extends JedisCommandTestBase {
 
-  @After
-  public void tearDown() throws Exception {
-    jedis.close();
-  }
-
   @Test
   public void pipeline() {
     Pipeline p = jedis.pipelined();
@@ -691,6 +687,47 @@ public void testCloseableWithMulti() throws IOException {
     jedis2.close();
   }
 
+  @Test
+  public void execAbort() {
+    final String luaTimeLimitKey = "lua-time-limit";
+    final String luaTimeLimit = jedis.configGet(luaTimeLimitKey).get(1);
+    jedis.configSet(luaTimeLimitKey, "10");
+
+    Thread thread = new Thread(() -> {
+      try (Jedis blocker = createJedis()) {
+        blocker.eval("while true do end");
+      } catch (Exception ex) {
+        // swallow any exception
+      }
+    });
+
+    Pipeline pipe = jedis.pipelined();
+    pipe.incr("foo");
+    pipe.multi();
+    pipe.incr("foo");
+    pipe.sync();
+
+    thread.start();
+    try {
+      Thread.sleep(12); // allow Redis to be busy with the script and 'lua-time-limit' to exceed
+    } catch (InterruptedException ex) { }
+
+    pipe.incr("foo");
+    Response<List<Object>> txResp = pipe.exec();
+    pipe.sync();
+    try {
+      txResp.get();
+    } catch (Exception ex) {
+      assertSame(AbortedTransactionException.class, ex.getClass());
+    } finally {
+      try {
+        jedis.scriptKill();
+      } finally {
+        jedis.configSet(luaTimeLimitKey, luaTimeLimit);
+      }
+    }
+  }
+
   private void verifyHasBothValues(String firstKey, String secondKey, String value1, String value2) {
     assertFalse(firstKey.equals(secondKey));
     assertTrue(firstKey.equals(value1) || firstKey.equals(value2));

src/test/java/redis/clients/jedis/tests/commands/JedisCommandTestBase.java

@@ -1,8 +1,5 @@
 package redis.clients.jedis.tests.commands;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import org.junit.After;
 import org.junit.Before;
 
@@ -29,7 +26,7 @@ public void setUp() throws Exception {
 
   @After
   public void tearDown() throws Exception {
-    jedis.disconnect();
+    jedis.close();
   }
 
   protected Jedis createJedis() {