gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't keep feeding data to clients pending close

Browse Source 
Former-commit-id: 4db3f2a443a6f71d1486781005ee37546e89d6e1
This commit is contained in:
John Sully 2020-05-24 12:46:11 -04:00
parent 975ca828d4
commit 0a1d2c99ac
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/replication.cpp
View File

@ -1458,6 +1458,9 @@ void rdbPipeReadHandler(struct aeEventLoop *eventLoop, int fd, void *clientData,
client *slave = (client*)connGetPrivateData(conn); client *slave = (client*)connGetPrivateData(conn);
std::unique_lock<fastlock> ul(slave->lock); std::unique_lock<fastlock> ul(slave->lock);
if(slave->flags.load(std::memory_order_relaxed) & CLIENT_CLOSE_ASAP)
continue; // if we asked to free the client don't send any more data
// Normally it would be bug to talk a client conn from a different thread, but here we know nobody else will // Normally it would be bug to talk a client conn from a different thread, but here we know nobody else will
// be sending anything while in this replication state so it is OK // be sending anything while in this replication state so it is OK
if ((nwritten = connWrite(conn, g_pserver->rdb_pipe_buff, g_pserver->rdb_pipe_bufflen)) == -1) { if ((nwritten = connWrite(conn, g_pserver->rdb_pipe_buff, g_pserver->rdb_pipe_bufflen)) == -1) {