Unverified Commit 5f42bfce authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo Committed by GitHub
Browse files

Merge pull request #5798 from trevor211/fixChildInfoPipeFdLeak

Fix child info pipe fd leak when child process gets killed.
parents cfdc800a adfaf548
...@@ -221,6 +221,7 @@ static void killAppendOnlyChild(void) { ...@@ -221,6 +221,7 @@ static void killAppendOnlyChild(void) {
server.aof_rewrite_time_start = -1; server.aof_rewrite_time_start = -1;
/* Close pipes used for IPC between the two processes. */ /* Close pipes used for IPC between the two processes. */
aofClosePipes(); aofClosePipes();
closeChildInfoPipe();
updateDictResizePolicy(); updateDictResizePolicy();
} }
......
...@@ -451,6 +451,7 @@ void flushallCommand(client *c) { ...@@ -451,6 +451,7 @@ void flushallCommand(client *c) {
if (server.rdb_child_pid != -1) { if (server.rdb_child_pid != -1) {
kill(server.rdb_child_pid,SIGUSR1); kill(server.rdb_child_pid,SIGUSR1);
rdbRemoveTempFile(server.rdb_child_pid); rdbRemoveTempFile(server.rdb_child_pid);
closeChildInfoPipe();
updateDictResizePolicy(); updateDictResizePolicy();
} }
if (server.saveparamslen > 0) { if (server.saveparamslen > 0) {
......
...@@ -1256,6 +1256,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { ...@@ -1256,6 +1256,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) {
(long) server.rdb_child_pid); (long) server.rdb_child_pid);
kill(server.rdb_child_pid,SIGUSR1); kill(server.rdb_child_pid,SIGUSR1);
rdbRemoveTempFile(server.rdb_child_pid); rdbRemoveTempFile(server.rdb_child_pid);
closeChildInfoPipe();
updateDictResizePolicy(); updateDictResizePolicy();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment