From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 27 Jan 2014 03:54:15 +0000 (-0500)
Subject: Fix: sessiond: wait for health check readiness
X-Git-Tag: v2.4.0-rc4~16
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=56045742fca088c61bdd8126403b5c18b7837962;p=lttng-tools.git

Fix: sessiond: wait for health check readiness

Wait for health check readiness before notifying the parent.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

Conflicts:
	src/bin/lttng-sessiond/main.c
---

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index c05be0a91..4a6b68a38 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -243,6 +243,38 @@ struct health_app *health_sessiond;
 /* JUL TCP port for registration. Used by the JUL thread. */
 unsigned int jul_tcp_port = DEFAULT_JUL_TCP_PORT;
 
+/*
+ * Whether sessiond is ready for commands/health check requests.
+ * NR_LTTNG_SESSIOND_READY must match the number of calls to
+ * lttng_sessiond_notify_ready().
+ */
+#define NR_LTTNG_SESSIOND_READY		2
+int lttng_sessiond_ready = NR_LTTNG_SESSIOND_READY;
+
+/* Notify parents that we are ready for cmd and health check */
+static
+void lttng_sessiond_notify_ready(void)
+{
+	if (uatomic_sub_return(&lttng_sessiond_ready, 1) == 0) {
+		/*
+		 * Notify parent pid that we are ready to accept command
+		 * for client side.  This ppid is the one from the
+		 * external process that spawned us.
+		 */
+		if (opt_sig_parent) {
+			kill(ppid, SIGUSR1);
+		}
+
+		/*
+		 * Notify the parent of the fork() process that we are
+		 * ready.
+		 */
+		if (opt_daemon) {
+			kill(child_ppid, SIGUSR1);
+		}
+	}
+}
+
 static
 void setup_consumerd_path(void)
 {
@@ -3565,6 +3597,8 @@ static void *thread_manage_health(void *data)
 		goto error;
 	}
 
+	lttng_sessiond_notify_ready();
+
 	while (1) {
 		DBG("Health check ready");
 
@@ -3715,18 +3749,7 @@ static void *thread_manage_clients(void *data)
 		goto error;
 	}
 
-	/*
-	 * Notify parent pid that we are ready to accept command for client side.
-	 * This ppid is the one from the external process that spawned us.
-	 */
-	if (opt_sig_parent) {
-		kill(ppid, SIGUSR1);
-	}
-
-	/* Notify the parent of the fork() process that we are ready. */
-	if (opt_daemon) {
-		kill(child_ppid, SIGUSR1);
-	}
+	lttng_sessiond_notify_ready();
 
 	/* This testpoint is after we signal readiness to the parent. */
 	if (testpoint(sessiond_thread_manage_clients)) {