Merge pull request #5569 from maximebedard/backport-4497

Backport #4497 to redis 4
This commit is contained in:
Salvatore Sanfilippo
2018-11-22 11:12:36 +01:00
committed by GitHub
3 changed files with 19 additions and 5 deletions

View File

@ -2226,7 +2226,7 @@ void replicationResurrectCachedMaster(int newfd) {
server.repl_down_since = 0;
/* Re-add to the list of clients. */
listAddNodeTail(server.clients,server.master);
linkClient(server.master);
if (aeCreateFileEvent(server.el, newfd, AE_READABLE,
readQueryFromClient, server.master)) {
serverLog(LL_WARNING,"Error resurrecting the cached master, impossible to add the readable handler: %s", strerror(errno));