From cdad0e6485d108f2bf330ae2e8ae5fa7ef158ec1 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 9 Jun 2020 11:52:33 +0200
Subject: Temporary fix for #7353 issue about EVAL during -BUSY.

---
 src/multi.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/multi.c b/src/multi.c
index 3e606fcec..60a07dfc7 100644
--- a/src/multi.c
+++ b/src/multi.c
@@ -135,6 +135,15 @@ void execCommand(client *c) {
         return;
     }
 
+    /* If we are in -BUSY state, flag the transaction and return the
+     * -BUSY error, like Redis <= 5. This is a temporary fix, may be changed
+     *  ASAP, see issue #7353 on Github. */
+    if (server.lua_timedout) {
+        flagTransaction(c);
+        addReply(c, shared.slowscripterr);
+        return;
+    }
+
     /* Check if we need to abort the EXEC because:
      * 1) Some WATCHed key was touched.
      * 2) There was a previous error while queueing commands.
-- 
cgit v1.2.1