caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 16:48:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't propagate spurious MULTI on DEBUG LOADAOF.

Browse Source
This commit is contained in:
antirez 2020-05-05 15:50:00 +02:00
parent 51ab31dbab
commit 373a3384ac
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/multi.c
View File

@ -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;
} }

4
src/server.c
View File

@ -3204,8 +3204,8 @@ void call(client *c, int flags) {
server.fixed_time_expire++; server.fixed_time_expire++;
/* Sent the command to clients in MONITOR mode, only if the commands are /* Send 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)))