Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
373a3384
Commit
373a3384
authored
May 05, 2020
by
antirez
Browse files
Don't propagate spurious MULTI on DEBUG LOADAOF.
parent
51ab31db
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/multi.c
View file @
373a3384
...
@@ -172,7 +172,10 @@ void execCommand(client *c) {
...
@@ -172,7 +172,10 @@ void execCommand(client *c) {
* This way we'll deliver the MULTI/..../EXEC block as a whole and
* This way we'll deliver the MULTI/..../EXEC block as a whole and
* both the AOF and the replication link will have the same consistency
* both the AOF and the replication link will have the same consistency
* and atomicity guarantees. */
* and atomicity guarantees. */
if
(
!
must_propagate
&&
!
(
c
->
cmd
->
flags
&
(
CMD_READONLY
|
CMD_ADMIN
)))
{
if
(
!
must_propagate
&&
!
server
.
loading
&&
!
(
c
->
cmd
->
flags
&
(
CMD_READONLY
|
CMD_ADMIN
)))
{
execCommandPropagateMulti
(
c
);
execCommandPropagateMulti
(
c
);
must_propagate
=
1
;
must_propagate
=
1
;
}
}
...
...
src/server.c
View file @
373a3384
...
@@ -3204,8 +3204,8 @@ void call(client *c, int flags) {
...
@@ -3204,8 +3204,8 @@ void call(client *c, int flags) {
server
.
fixed_time_expire
++
;
server
.
fixed_time_expire
++
;
/* Sen
t
the command to clients in MONITOR mode
, only if the commands are
/* Sen
d
the command to clients in MONITOR mode
if applicable.
*
not generated from reading an AOF
. */
*
Administrative commands are considered too dangerous to be shown
. */
if
(
listLength
(
server
.
monitors
)
&&
if
(
listLength
(
server
.
monitors
)
&&
!
server
.
loading
&&
!
server
.
loading
&&
!
(
c
->
cmd
->
flags
&
(
CMD_SKIP_MONITOR
|
CMD_ADMIN
)))
!
(
c
->
cmd
->
flags
&
(
CMD_SKIP_MONITOR
|
CMD_ADMIN
)))
...
...
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