mirror of
https://github.com/redis/redis.git
synced 2026-02-03 20:39:54 -05:00
Merge 13c2f7adbb into b5a37c0e42
This commit is contained in:
commit
d945f4db6f
1 changed files with 11 additions and 1 deletions
|
|
@ -1802,7 +1802,17 @@ void disconnectSlaves(void) {
|
|||
listNode *ln;
|
||||
listRewind(server.slaves,&li);
|
||||
while((ln = listNext(&li))) {
|
||||
freeClient((client*)ln->value);
|
||||
/* Attempt to flush pending replication stream before disconnecting
|
||||
* slaves without blocking, increasing the chances of successful
|
||||
* psync for slaves when failed over. */
|
||||
client *slave = (client*)ln->value;
|
||||
writeToClient(slave,0);
|
||||
if (clientHasPendingReplies(slave)) {
|
||||
sds client_desc = catClientInfoString(sdsempty(), slave);
|
||||
serverLog(LL_NOTICE, "Slave still have pending replies when disconnect: %s", client_desc);
|
||||
sdsfree(client_desc);
|
||||
}
|
||||
freeClient(slave);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue