More robust handling of AOF rewrite child.
After the wait3() syscall we used to do something like that: if (pid == server.rdb_child_pid) { backgroundSaveDoneHandler(exitcode,bysignal); } else { .... } So the AOF rewrite was handled in the else branch without actually checking if the pid really matches. This commit makes the check explicit and logs at WARNING level if the pid returned by wait3() does not match neither the RDB or AOF rewrite child.
This commit is contained in:
parent
f0266532fc
commit
05d8e2c938
@ -915,8 +915,12 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
|
|||||||
|
|
||||||
if (pid == server.rdb_child_pid) {
|
if (pid == server.rdb_child_pid) {
|
||||||
backgroundSaveDoneHandler(exitcode,bysignal);
|
backgroundSaveDoneHandler(exitcode,bysignal);
|
||||||
} else {
|
} else if (pid == server.aof_child_pid) {
|
||||||
backgroundRewriteDoneHandler(exitcode,bysignal);
|
backgroundRewriteDoneHandler(exitcode,bysignal);
|
||||||
|
} else {
|
||||||
|
redisLog(REDIS_WARNING,
|
||||||
|
"Warning, detected child with unmatched pid: %ld",
|
||||||
|
(long)pid);
|
||||||
}
|
}
|
||||||
updateDictResizePolicy();
|
updateDictResizePolicy();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user