Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
5f42bfce
Unverified
Commit
5f42bfce
authored
Jan 21, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Jan 21, 2019
Browse files
Merge pull request #5798 from trevor211/fixChildInfoPipeFdLeak
Fix child info pipe fd leak when child process gets killed.
parents
cfdc800a
adfaf548
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
5f42bfce
...
@@ -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
();
}
}
...
...
src/db.c
View file @
5f42bfce
...
@@ -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
)
{
...
...
src/replication.c
View file @
5f42bfce
...
@@ -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
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment