diff options
author | antirez <antirez@gmail.com> | 2020-06-09 11:52:33 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2020-06-09 11:53:01 +0200 |
commit | ee8dd01bbcaab39c643b005c4acb93c132b07aa3 (patch) | |
tree | 7492c25e15361f267f5dc4624cded4831d1ba5bc | |
parent | a4a856d5326dbce60b907a4ef5a1b5379ba52c85 (diff) | |
download | redis-ee8dd01bbcaab39c643b005c4acb93c132b07aa3.tar.gz |
Temporary fix for #7353 issue about EVAL during -BUSY.
-rw-r--r-- | src/multi.c | 9 |
1 files changed, 9 insertions, 0 deletions
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. |