From: antirez <antirez@gmail.com>
Date: Thu, 1 Nov 2012 21:39:39 +0000 (+0100)
Subject: More robust handling of AOF rewrite child.
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/36f026a3a0049fdf924c709a1e7ff00fea4e70bb

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.
---

diff --git a/src/redis.c b/src/redis.c
index 87f5e812..b42fac35 100644
--- a/src/redis.c
+++ b/src/redis.c
@@ -902,8 +902,12 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) {
 
             if (pid == server.rdb_child_pid) {
                 backgroundSaveDoneHandler(exitcode,bysignal);
-            } else {
+            } else if (pid == server.aof_child_pid) {
                 backgroundRewriteDoneHandler(exitcode,bysignal);
+            } else {
+                redisLog(REDIS_WARNING,
+                    "Warning, detected child with unmatched pid: %ld",
+                    (long)pid);
             }
             updateDictResizePolicy();
         }