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
c4f3585e
Commit
c4f3585e
authored
Dec 11, 2018
by
zhaozhao.zz
Committed by
antirez
Dec 11, 2018
Browse files
multi: ignore multiState's cmd_flags when loading AOF
parent
d037e987
Changes
1
Show whitespace changes
Inline
Side-by-side
src/multi.c
View file @
c4f3585e
...
@@ -144,7 +144,7 @@ void execCommand(client *c) {
...
@@ -144,7 +144,7 @@ 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
,
...
...
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