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

fixes for fork child exit and test: #11463 (#11499)

Browse Source 
Fix a few issues with the recent #11463
* use exitFromChild instead of exit
* test should ignore defunct process since that's what we expect to
  happen for thees child processes when the parent dies.
* fix typo

Co-authored-by: Binbin <binloveplay1314@qq.com>
This commit is contained in:
Oran Agra 2022-11-12 20:35:34 +02:00 committed by GitHub
parent 6617f1704b
commit 4c54528f0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/childinfo.c
View File

@ -114,7 +114,7 @@ void sendChildInfoGeneric(childInfoType info_type, size_t keys, double progress,
if (write(server.child_info_pipe[1], &data, wlen) != wlen) { if (write(server.child_info_pipe[1], &data, wlen) != wlen) {
/* Failed writing to parent, it could have been killed, exit. */ /* Failed writing to parent, it could have been killed, exit. */
serverLog(LL_WARNING,"Child failed reporting info to parent, exiting. %s", strerror(errno)); serverLog(LL_WARNING,"Child failed reporting info to parent, exiting. %s", strerror(errno));
exit(1); exitFromChild(1);
} }
} }

2
tests/integration/replication.tcl
View File

@ -1013,7 +1013,7 @@ test "diskless replication child being killed is collected" {
} {} {external:skip} } {} {external:skip}
foreach mdl {yes no} { foreach mdl {yes no} {
test "replication dies when parent is killed - diskless: $mdl" { test "replication child dies when parent is killed - diskless: $mdl" {
# when master is killed, make sure the fork child can detect that and exit # when master is killed, make sure the fork child can detect that and exit
start_server {tags {"repl"}} { start_server {tags {"repl"}} {
set master [srv 0 client] set master [srv 0 client]

1
tests/support/util.tcl
View File

@ -631,6 +631,7 @@ proc process_is_alive pid {
if {[catch {exec ps -p $pid} err]} { if {[catch {exec ps -p $pid} err]} {
return 0 return 0
} else { } else {
if {[string match "*<defunct>*" $err]} { return 0 }
return 1 return 1
} }
} }