Fix crash propogating stale keys
Former-commit-id: d95bead3837edeca11f27f6f344eca8174ca53e3
This commit is contained in:
parent
5e885739ef
commit
48ba6c173c
@ -278,7 +278,7 @@ void replicationFeedSlave(client *replica, int dictid, robj **argv, int argc, bo
|
|||||||
if (g_pserver->repl_backlog && fSendRaw) feedReplicationBacklogWithObject(selectcmd);
|
if (g_pserver->repl_backlog && fSendRaw) feedReplicationBacklogWithObject(selectcmd);
|
||||||
|
|
||||||
/* Send it to slaves */
|
/* Send it to slaves */
|
||||||
addReply(replica,selectcmd);
|
addReplyAsync(replica,selectcmd);
|
||||||
|
|
||||||
if (dictid < 0 || dictid >= PROTO_SHARED_SELECT_CMDS)
|
if (dictid < 0 || dictid >= PROTO_SHARED_SELECT_CMDS)
|
||||||
decrRefCount(selectcmd);
|
decrRefCount(selectcmd);
|
||||||
@ -290,12 +290,12 @@ void replicationFeedSlave(client *replica, int dictid, robj **argv, int argc, bo
|
|||||||
* or are already in sync with the master. */
|
* or are already in sync with the master. */
|
||||||
|
|
||||||
/* Add the multi bulk length. */
|
/* Add the multi bulk length. */
|
||||||
addReplyArrayLen(replica,argc);
|
addReplyArrayLenAsync(replica,argc);
|
||||||
|
|
||||||
/* Finally any additional argument that was not stored inside the
|
/* Finally any additional argument that was not stored inside the
|
||||||
* static buffer if any (from j to argc). */
|
* static buffer if any (from j to argc). */
|
||||||
for (int j = 0; j < argc; j++)
|
for (int j = 0; j < argc; j++)
|
||||||
addReplyBulk(replica,argv[j]);
|
addReplyBulkAsync(replica,argv[j]);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Propagate write commands to slaves, and populate the replication backlog
|
/* Propagate write commands to slaves, and populate the replication backlog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user