Hi, Sorry for the late response, I've been out for nearly two weeks. I'm attaching a new version of the patch to review.
> Does upstart/init script need to be updated as well? > We have some generic in src/sysv/sssd.in Upstart does need to keep track of the pidfile creation. I can't see a service file, so I'll prepare one. Regarding sysv, due to its sequential nature, it's dangerous to include an infinite loop because it could stuck the normal boot of the machine. I included a timeout in the loop to avoid this, please let me know what you think about it. > BTW the patch causes some failures for me on rhel6. > According to logs, the file /var/run/sssd.pid > did not exist in some cases. > > Please also remove changes in src/sysv/systemd/sssd.service.in > in next version. For systemd only I would prefer "Type=notify". Done, I've switched to Type=notify for systemd. Thanks, Victor
>From 65f587535fae28719d3f2455fe144dd008361d52 Mon Sep 17 00:00:00 2001 From: Victor Tapia <victor.ta...@canonical.com> Date: Fri, 26 Aug 2016 13:01:32 +0200 Subject: [PATCH] Create pidfile after responders started --- Makefile.am | 1 + src/monitor/monitor.c | 42 ++++++++++++++++++++++++++++++++++++---- src/sysv/sssd.in | 11 +++++++++++ src/sysv/systemd/sssd.service.in | 3 ++- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8b9240f..ce9a128 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1243,6 +1243,7 @@ sssd_LDADD = \ $(INOTIFY_LIBS) \ $(LIBNL_LIBS) \ $(KEYUTILS_LIBS) \ + $(SYSTEMD_DAEMON_LIBS) \ $(SSSD_INTERNAL_LTLIBS) sssd_nss_SOURCES = \ diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index 7a9ef56..b163e79 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -55,6 +55,10 @@ #include <keyutils.h> #endif +#ifdef HAVE_SYSTEMD +#include <systemd/sd-daemon.h> +#endif + /* terminate the child after this interval by default if it * doesn't shutdown on receiving SIGTERM */ #define MONITOR_DEF_FORCE_TIME 60 @@ -163,6 +167,7 @@ struct mt_ctx { struct netlink_ctx *nlctx; const char *conf_path; struct sss_sigchild_ctx *sigchld_ctx; + bool pid_file_created; bool is_daemon; pid_t parent_pid; @@ -591,7 +596,29 @@ static int mark_service_as_started(struct mt_svc *svc) ctx->started_services++; } - if (ctx->started_services == ctx->num_services) { + /* create the pid file if all services are alive */ + if (!ctx->pid_file_created && ctx->started_services == ctx->num_services) { + DEBUG(SSSDBG_TRACE_FUNC, "All services have successfully started, " + "creating pid file\n"); + ret = pidfile(PID_PATH, MONITOR_NAME); + if (ret != EOK) { + DEBUG(SSSDBG_FATAL_FAILURE, + "Error creating pidfile: %s/%s.pid! (%d [%s])\n", + PID_PATH, MONITOR_NAME, ret, strerror(ret)); + kill(getpid(), SIGTERM); + } + + ctx->pid_file_created = true; + +#ifdef HAVE_SYSTEMD + DEBUG(SSSDBG_TRACE_FUNC, "Sending startup notification to systemd\n"); + ret = sd_notify(0, "READY=1"); + if (ret != EOK) { + DEBUG(SSSDBG_CRIT_FAILURE, "Error sending notification to systemd" + " %d: %s\n", -ret, strerror(-ret)); + } +#endif + /* Initialization is complete, terminate parent process if in daemon * mode. Make sure we send the signal to the right process */ if (ctx->is_daemon) { @@ -1794,6 +1821,7 @@ errno_t load_configuration(TALLOC_CTX *mem_ctx, return ENOMEM; } + ctx->pid_file_created = false; talloc_set_destructor((TALLOC_CTX *)ctx, monitor_ctx_destructor); cdb_file = talloc_asprintf(ctx, "%s/%s", DB_PATH, CONFDB_FILE); @@ -2883,9 +2911,6 @@ int main(int argc, const char *argv[]) return 6; } - /* we want a pid file check */ - flags |= FLAGS_PID_FILE; - /* Open before server_setup() does to have logging * during configuration checking */ if (debug_to_file) { @@ -2950,6 +2975,15 @@ int main(int argc, const char *argv[]) } } + /* Check if the SSSD is already running */ + ret = check_file(SSSD_PIDFILE, 0, 0, S_IFREG|0600, 0, NULL, false); + if (ret == EOK) { + DEBUG(SSSDBG_FATAL_FAILURE, + "pidfile exists at %s\n", SSSD_PIDFILE); + ERROR("SSSD is already running\n"); + return 2; + } + /* Parse config file, fail if cannot be done */ ret = load_configuration(tmp_ctx, config_file, CONFDB_DEFAULT_CONFIG_DIR, &monitor); diff --git a/src/sysv/sssd.in b/src/sysv/sssd.in index 5109148..1c2c3c4 100644 --- a/src/sysv/sssd.in +++ b/src/sysv/sssd.in @@ -40,6 +40,8 @@ SSSD=@sbindir@/sssd LOCK_FILE=@localstatedir@/lock/subsys/sssd PID_FILE=@localstatedir@/run/sssd.pid +TIMEOUT=15 + start() { [ -x $SSSD ] || exit 5 echo -n $"Starting $prog: " @@ -47,6 +49,15 @@ start() { RETVAL=$? echo [ "$RETVAL" = 0 ] && touch $LOCK_FILE + + # Wait for pidfile creation or timeout + sec=0 + [ "$RETVAL" = 0 ] && while [ $sec -lt $TIMEOUT -a ! -f $PID_FILE ] + do + sleep 1 + sec=$(($sec+1)) + done + return $RETVAL } diff --git a/src/sysv/systemd/sssd.service.in b/src/sysv/systemd/sssd.service.in index a4f9125..976c9c1 100644 --- a/src/sysv/systemd/sssd.service.in +++ b/src/sysv/systemd/sssd.service.in @@ -9,7 +9,8 @@ EnvironmentFile=-@environment_file@ ExecStart=@sbindir@/sssd -D -f # These two should be used with traditional UNIX forking daemons # consult systemd.service(5) for more details -Type=forking +Type=notify +NotifyAccess=all PIDFile=@localstatedir@/run/sssd.pid [Install] -- 2.7.4
_______________________________________________ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org