Merge branch 'unstable' into fixChildInfoPipeFdLeak

This commit is contained in:
Salvatore Sanfilippo
2019-01-21 11:20:56 +01:00
committed by GitHub
54 changed files with 2377 additions and 890 deletions

View File

@ -222,6 +222,7 @@ static void killAppendOnlyChild(void) {
/* Close pipes used for IPC between the two processes. */
aofClosePipes();
closeChildInfoPipe();
updateDictResizePolicy();
}
/* Called when the user switches from "appendonly yes" to "appendonly no"
@ -646,6 +647,8 @@ struct client *createFakeClient(void) {
c->obuf_soft_limit_reached_time = 0;
c->watched_keys = listCreate();
c->peerid = NULL;
c->resp = 2;
c->user = NULL;
listSetFreeMethod(c->reply,freeClientReplyValue);
listSetDupMethod(c->reply,dupClientReplyValue);
initClientMultiState(c);