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

If a replica is about to be closed, don't wait on its lock (potential deadlock)

Browse Source 
Former-commit-id: 4986dc6da9855ba14d760a89f13ec40c8bea4baf
This commit is contained in:
John Sully 2019-10-23 13:20:23 -04:00
parent 6dc17bbe1f
commit 5f930a4f79
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/replication.cpp
View File

@ -384,6 +384,7 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
/* Don't feed slaves that are still waiting for BGSAVE to start */ /* Don't feed slaves that are still waiting for BGSAVE to start */
if (replica->replstate == SLAVE_STATE_WAIT_BGSAVE_START) continue; if (replica->replstate == SLAVE_STATE_WAIT_BGSAVE_START) continue;
if (replica->flags & CLIENT_CLOSE_ASAP) continue;
std::unique_lock<decltype(replica->lock)> lock(replica->lock); std::unique_lock<decltype(replica->lock)> lock(replica->lock);
if (serverTL->current_client && FSameHost(serverTL->current_client, replica)) if (serverTL->current_client && FSameHost(serverTL->current_client, replica))
{ {