fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-11 16:21:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6296 from soloestoy/flushSlavesOutputBuffers-bugfix

Browse Source 
networking: flushSlavesOutputBuffers bugfix
This commit is contained in:
Salvatore Sanfilippo
2019-08-31 14:39:33 +02:00
committed by GitHub
parent d5536e0480 d3f7eb0c87
commit 16435e02bf
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/networking.c
View File

@ -2468,7 +2468,6 @@ void flushSlavesOutputBuffers(void) {
listRewind(server.slaves,&li);
while((ln = listNext(&li))) {
client *slave = listNodeValue(ln);
int events;
/* Note that the following will not flush output buffers of slaves
* in STATE_ONLINE but having put_online_on_ack set to true: in this
@ -2476,9 +2475,8 @@ void flushSlavesOutputBuffers(void) {
* of put_online_on_ack is to postpone the moment it is installed.
* This is what we want since slaves in this state should not receive
* writes before the first ACK. */
events = aeGetFileEvents(server.el,slave->fd);
if (events & AE_WRITABLE &&
slave->replstate == SLAVE_STATE_ONLINE &&
if (slave->replstate == SLAVE_STATE_ONLINE &&
!slave->repl_put_online_on_ack &&
clientHasPendingReplies(slave))
{
writeToClient(slave->fd,slave,0);