diff options
author | Simo Sorce <ssorce@redhat.com> | 2009-10-02 19:36:01 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2009-10-09 16:11:08 -0400 |
commit | dc55d62f4d9f6520ffcb4aa8c6beb308896d9fbb (patch) | |
tree | 7842b16b9ce9e4367c2a9a6f05db25fc40b2ab08 /server/monitor/monitor.c | |
parent | 1f2b3f82f9896a99f8f2b8b2145af47402a9c3c6 (diff) | |
download | sssd-dc55d62f4d9f6520ffcb4aa8c6beb308896d9fbb.tar.gz sssd-dc55d62f4d9f6520ffcb4aa8c6beb308896d9fbb.tar.bz2 sssd-dc55d62f4d9f6520ffcb4aa8c6beb308896d9fbb.zip |
Remove DP process
Turn the backend process into data provider servers
Make Frontends (pam, nss) directly attach to the backends
Diffstat (limited to 'server/monitor/monitor.c')
-rw-r--r-- | server/monitor/monitor.c | 55 |
1 files changed, 17 insertions, 38 deletions
diff --git a/server/monitor/monitor.c b/server/monitor/monitor.c index ef91b6b6..abd881e0 100644 --- a/server/monitor/monitor.c +++ b/server/monitor/monitor.c @@ -117,6 +117,7 @@ struct mt_ctx { struct config_file_ctx *file_ctx; int inotify_fd; int service_id_timeout; + bool check_children; }; static int start_service(struct mt_svc *mt_svc, bool startup); @@ -487,6 +488,10 @@ static void global_checks_handler(struct tevent_context *ev, int status; pid_t pid; + if (!ctx->check_children) { + goto done; + } + errno = 0; pid = waitpid(0, &status, WNOHANG); if (pid == 0) { @@ -785,33 +790,6 @@ static int check_domain_ranges(struct sss_domain_info *domains) return EOK; } -static int append_data_provider(struct mt_ctx *ctx) -{ - int i; - char **new_services; - - for (i = 0; ctx->services[i]; i++) { - if (strcasecmp(ctx->services[i], "dp") == 0) { - return EOK; - } - } - - new_services = talloc_realloc(ctx, ctx->services, char *, i+2); - if (new_services == NULL) { - return ENOMEM; - } - ctx->services = new_services; - - ctx->services[i] = talloc_asprintf(ctx, "dp"); - if (ctx->services[i] == NULL) { - return ENOMEM; - } - ctx->services[i+1] = NULL; - DEBUG(4, ("Added mandatory service Data Provider\n")); - - return EOK; -} - static int check_local_domain_unique(struct sss_domain_info *domains) { uint8_t count = 0; @@ -864,11 +842,6 @@ int get_monitor_config(struct mt_ctx *ctx) DEBUG(0, ("No services configured!\n")); return EINVAL; } - ret = append_data_provider(ctx); - if (ret != EOK) { - DEBUG(0, ("Could not add Data Provider to the list of services!\n")); - return ret; - } ctx->domain_ctx = talloc_new(ctx); if(!ctx->domain_ctx) { @@ -2273,13 +2246,18 @@ static int start_service(struct mt_svc *svc, bool startup) DEBUG(4,("Queueing service %s for startup\n", svc->name)); - /* at startup we need to start the data provider service before all others - * to avoid races where a service that need dp starts before it is ready - * to accept connections on its dbus. So if startup is true delay by 1 - * second any process that is not the data provider */ + /* at startup we need to start the data providers before the responders + * to avoid races where a service starts before sbus pipes are ready + * to accept connections. So if startup is true delay by 2 seconds any + * process that is not a data provider */ + + /* FIXME: use stat to check the pipes are available instead and rescheduleif + * not */ - if (startup && strcasecmp(svc->name, "dp")) { - tv = tevent_timeval_current_ofs(1, 0); + if (startup && + ((strcasecmp(svc->name, "nss") == 0) || + (strcasecmp(svc->name, "pam") == 0))) { + tv = tevent_timeval_current_ofs(2, 0); } else { tv = tevent_timeval_current(); } @@ -2336,6 +2314,7 @@ static void service_startup_handler(struct tevent_context *ev, } /* Parent */ + mt_svc->mt_ctx->check_children = true; mt_svc->failed_pongs = 0; DLIST_ADD(mt_svc->mt_ctx->svc_list, mt_svc); talloc_set_destructor((TALLOC_CTX *)mt_svc, delist_service); |