Wait for Redis server to be stable after SCRIPT KILL

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

@@ -30,6 +30,7 @@
 import redis.clients.jedis.Response;
 import redis.clients.jedis.Tuple;
 import redis.clients.jedis.exceptions.AbortedTransactionException;
+import redis.clients.jedis.exceptions.JedisBusyException;
 import redis.clients.jedis.exceptions.JedisDataException;
 import redis.clients.jedis.tests.commands.JedisCommandTestBase;
 import redis.clients.jedis.util.SafeEncoder;
@@ -734,13 +735,41 @@ public void execAbort() {
       assertSame(AbortedTransactionException.class, ex.getClass());
     } finally {
       try {
-        jedis.scriptKill();
+        String status = jedis.scriptKill();
+        // https://github.com/redis/jedis/issues/2656
+        if ("OK".equalsIgnoreCase(status)) {
+          scriptKillWait();
+        } else {
+          // #2656: Checking if this status is actually 'OK' when error occurs in next command.
+          org.apache.logging.log4j.LogManager.getLogger().error(
+              String.format("Status if SCRIPT KILL command is \"%s\"", status));
+        }
       } finally {
         jedis.configSet(luaTimeLimitKey, luaTimeLimit);
       }
     }
   }
 
+  private void scriptKillWait() {
+    int attemptLeft = 10;
+    while (attemptLeft > 0) {
+      try (Jedis pingJedis = createJedis()) {
+        while (attemptLeft > 0) {
+          try {
+            pingJedis.ping();
+            return; // wait is over
+          } catch (JedisBusyException busy) {
+            --attemptLeft;
+            Thread.sleep(10); // BUSY, waiting for some time
+          }
+        }
+      } catch (Exception any) {
+        --attemptLeft;
+        // try new connection
+      }
+    }
+  }
+
   private void verifyHasBothValues(String firstKey, String secondKey, String value1, String value2) {
     assertFalse(firstKey.equals(secondKey));
     assertTrue(firstKey.equals(value1) || firstKey.equals(value2));