From: Martin Schwenke <martin@meltin.net>
Date: Fri, 24 Aug 2018 04:52:29 +0000 (+1000)
Subject: ctdb-event: Add support to eventd for the startup notification FD
X-Git-Tag: tdb-1.3.17~1987
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ee92d1bfd73c509d90e7a7386af60a4e1a7fca;p=thirdparty%2Fsamba.git

ctdb-event: Add support to eventd for the startup notification FD

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13592

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/event/event_daemon.c b/ctdb/event/event_daemon.c
index 63c4dad2866..c1c6852cca5 100644
--- a/ctdb/event/event_daemon.c
+++ b/ctdb/event/event_daemon.c
@@ -218,14 +218,18 @@ static bool event_client_recv(struct tevent_req *req, int *perr)
 
 static struct {
 	int pid;
+	int startup_fd;
 } options = {
 	.pid = -1,
+	.startup_fd = -1,
 };
 
 struct poptOption cmdline_options[] = {
 	POPT_AUTOHELP
 	{ "pid", 'P', POPT_ARG_INT, &options.pid, 0,
 		"pid to wait for", "PID" },
+	{ "startup-fd", 'S', POPT_ARG_INT, &options.startup_fd, 0,
+		"file descriptor to notify of successful start", "FD" },
 	POPT_TABLEEND
 };
 
@@ -338,6 +342,10 @@ int main(int argc, const char **argv)
 		goto fail;
 	}
 
+	if (options.startup_fd != -1) {
+		sock_daemon_set_startup_fd(e_state->sockd, options.startup_fd);
+	}
+
 	ret = sock_daemon_run(e_state->ev,
 			      e_state->sockd,
 			      e_state->pidfile,