Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
11d399dd
Unverified
Commit
11d399dd
authored
Dec 11, 2018
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 11, 2018
Browse files
Merge pull request #5684 from soloestoy/ignore-multi-cmd-flags-loading-aof
multi: ignore multiState's cmd_flags when loading AOF
parents
27453139
6100be7d
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/multi.c
View file @
11d399dd
...
@@ -144,12 +144,12 @@ void execCommand(client *c) {
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment