s3: reinit_after_fork() should reinit the event context before the

messaging context

Because messaging_reinit() may add events to the event context, which will
removed by event_context_reinit().

metze
(cherry picked from commit 56af6112d67aa9dd3757297fbe29ce1a3eabf00d)

diff --git a/source/lib/util.c b/source/lib/util.c
index 5ec6f2641035af5c958e054b206cb040869685be..0ea7bf6ec2fdb60a8362519c6e1b55cd195a3778 100644 (file)
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -1055,6 +1055,10 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
                return false;
        }
 
+       if (ev_ctx) {
+               event_context_reinit(ev_ctx);
+       }
+
        if (msg_ctx) {
                /*
                 * For clustering, we need to re-init our ctdbd connection after the
@@ -1068,10 +1072,6 @@ bool reinit_after_fork(struct messaging_context *msg_ctx,
                }
        }
 
-       if (ev_ctx) {
-               event_context_reinit(ev_ctx);
-       }
-
        return true;
 }