fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-01 23:31:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5684 from soloestoy/ignore-multi-cmd-flags-loading-aof

Browse Source 
multi: ignore multiState's cmd_flags when loading AOF
This commit is contained in:
Salvatore Sanfilippo 2018-12-11 12:57:25 +01:00 committed by GitHub
commit 11d399dded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/multi.c
View File

@ -144,12 +144,12 @@ void execCommand(client *c) {
* was initiated when the instance was a master or a writable replica and * was initiated when the instance was a master or a writable replica and
* then the configuration changed (for example instance was turned into * then the configuration changed (for example instance was turned into
* a replica). */ * 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) !(c->flags & CLIENT_MASTER) && c->mstate.cmd_flags & CMD_WRITE)
{ {
addReplyError(c, addReplyError(c,
"Transaction contains write commands but instance " "Transaction contains write commands but instance "
"is now a read-only slave. EXEC aborted."); "is now a read-only replica. EXEC aborted.");
discardTransaction(c); discardTransaction(c);
goto handle_monitor; goto handle_monitor;
} }