responders: improve intial get_domains request

This patch makes schedule_get_domains_task synchronous and makes sure it is finished before client sockets are opened.
sumit-bose · May 5, 2017 · cff1004 · cff1004
1 parent 21f3d61
commit cff1004
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 48 deletions.
diff --git a/src/responder/autofs/autofssrv.c b/src/responder/autofs/autofssrv.c
@@ -167,12 +167,6 @@ autofs_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, NULL);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
-        goto fail;
-    }
-
     DEBUG(SSSDBG_TRACE_FUNC, "autofs Initialization complete\n");
     return EOK;
 

diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
@@ -1233,10 +1233,9 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
-    /* after all initializations we are ready to listen on our socket */
-    ret = activate_unix_sockets(rctx, conn_setup);
+    ret = responder_init_ncache(rctx, rctx->cdb, &rctx->ncache);
     if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "fatal error initializing socket\n");
+        DEBUG(SSSDBG_CRIT_FAILURE, "fatal error initializing negcache\n");
         goto fail;
     }
 
@@ -1248,9 +1247,16 @@ int sss_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
-    ret = responder_init_ncache(rctx, rctx->cdb, &rctx->ncache);
+    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, rctx->ncache);
     if (ret != EOK) {
-        DEBUG(SSSDBG_CRIT_FAILURE, "fatal error initializing negcache\n");
+        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
+        goto fail;
+    }
+
+    /* after all initializations we are ready to listen on our socket */
+    ret = activate_unix_sockets(rctx, conn_setup);
+    if (ret != EOK) {
+        DEBUG(SSSDBG_FATAL_FAILURE, "fatal error initializing socket\n");
         goto fail;
     }
 

diff --git a/src/responder/common/responder_get_domains.c b/src/responder/common/responder_get_domains.c
@@ -382,6 +382,7 @@ static errno_t check_last_request(struct resp_ctx *rctx, const char *hint)
 struct get_domains_state {
     struct resp_ctx *rctx;
     struct sss_nc_ctx *optional_ncache;
+    bool get_domains_done;
 };
 
 static void get_domains_at_startup_done(struct tevent_req *req)
@@ -405,6 +406,7 @@ static void get_domains_at_startup_done(struct tevent_req *req)
         }
     }
 
+    state->get_domains_done = true;
     talloc_free(state);
     return;
 }
@@ -443,6 +445,7 @@ errno_t schedule_get_domains_task(TALLOC_CTX *mem_ctx,
     }
     state->rctx = rctx;
     state->optional_ncache = optional_ncache;
+    state->get_domains_done = false;
 
     imm = tevent_create_immediate(mem_ctx);
     if (imm == NULL) {
@@ -453,6 +456,11 @@ errno_t schedule_get_domains_task(TALLOC_CTX *mem_ctx,
 
     tevent_schedule_immediate(imm, ev, get_domains_at_startup, state);
 
+    while (!state->get_domains_done) {
+        DEBUG(SSSDBG_TRACE_ALL, "Waiting for init_done ...\n");
+        tevent_loop_once(rctx->ev);
+    }
+
     return EOK;
 }
 

diff --git a/src/responder/ifp/ifpsrv.c b/src/responder/ifp/ifpsrv.c
@@ -336,13 +336,6 @@ int ifp_process_init(TALLOC_CTX *mem_ctx,
         return EIO;
     }
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, NULL);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE,
-              "schedule_get_domains_tasks failed.\n");
-        goto fail;
-    }
-
     DEBUG(SSSDBG_TRACE_FUNC, "InfoPipe Initialization complete\n");
     return EOK;
 

diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c
@@ -485,12 +485,6 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
     }
     responder_set_fd_limit(fd_limit);
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, nctx->rctx->ncache);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
-        goto fail;
-    }
-
     DEBUG(SSSDBG_TRACE_FUNC, "NSS Initialization complete\n");
 
     return EOK;

diff --git a/src/responder/pac/pacsrv.c b/src/responder/pac/pacsrv.c
@@ -190,12 +190,6 @@ int pac_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, NULL);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
-        goto fail;
-    }
-
     DEBUG(SSSDBG_TRACE_FUNC, "PAC Initialization complete\n");
 
     return EOK;

diff --git a/src/responder/pam/pamsrv.c b/src/responder/pam/pamsrv.c
@@ -304,12 +304,6 @@ static int pam_process_init(TALLOC_CTX *mem_ctx,
     }
     responder_set_fd_limit(fd_limit);
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, pctx->rctx->ncache);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
-        goto done;
-    }
-
     /* Check if certificate based authentication is enabled */
     ret = confdb_get_bool(pctx->rctx->cdb,
                           CONFDB_PAM_CONF_ENTRY,

diff --git a/src/responder/ssh/sshsrv.c b/src/responder/ssh/sshsrv.c
@@ -158,12 +158,6 @@ int ssh_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, NULL);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
-        goto fail;
-    }
-
     DEBUG(SSSDBG_TRACE_FUNC, "SSH Initialization complete\n");
 
     return EOK;

diff --git a/src/responder/sudo/sudosrv.c b/src/responder/sudo/sudosrv.c
@@ -148,12 +148,6 @@ int sudo_process_init(TALLOC_CTX *mem_ctx,
         goto fail;
     }
 
-    ret = schedule_get_domains_task(rctx, rctx->ev, rctx, NULL);
-    if (ret != EOK) {
-        DEBUG(SSSDBG_FATAL_FAILURE, "schedule_get_domains_tasks failed.\n");
-        goto fail;
-    }
-
     DEBUG(SSSDBG_TRACE_FUNC, "SUDO Initialization complete\n");
 
     return EOK;