summaryrefslogtreecommitdiff
path: root/src/multi.c
diff options
context:
space:
mode:
authorzhaozhao.zz <zhaozhao.zz@alibaba-inc.com>2018-12-11 19:47:36 +0800
committerzhaozhao.zz <zhaozhao.zz@alibaba-inc.com>2018-12-11 19:47:36 +0800
commit1530c0a7dd10f67ff5a1622c107478c6d8275867 (patch)
tree2731bf25e08378696f9364c376b4c25f6775918f /src/multi.c
parent274531396caedd710595f46cc14010ed68a0c931 (diff)
downloadredis-1530c0a7dd10f67ff5a1622c107478c6d8275867.tar.gz
multi: ignore multiState's cmd_flags when loading AOF
Diffstat (limited to 'src/multi.c')
-rw-r--r--src/multi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/multi.c b/src/multi.c
index c2e641879..5971f4653 100644
--- a/src/multi.c
+++ b/src/multi.c
@@ -144,7 +144,7 @@ void execCommand(client *c) {
* was initiated when the instance was a master or a writable replica and
* then the configuration changed (for example instance was turned into
* a replica). */
- if (server.masterhost && server.repl_slave_ro &&
+ if (!server.loading && server.masterhost && server.repl_slave_ro &&
!(c->flags & CLIENT_MASTER) && c->mstate.cmd_flags & CMD_WRITE)
{
addReplyError(c,