diff options
| author | Milind Changire <mchangir@redhat.com> | 2017-12-11 14:41:57 +0530 |
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2017-12-12 14:42:05 +0000 |
| commit | 56e5fdae74845dfec0ff7ad0c8fee77695d36ad5 (patch) | |
| tree | d931d2f0bc9a9a3ce175858cbe3ea027279c710b /glusterfsd | |
| parent | e016bcaf8171373cbc327faf42a6b2f2c5449b0e (diff) | |
rpc: merge ssl infra with epoll infra
Patch attempts to use the epoll infra for handling SSL connections
as well instead of the socket_poller() thread func.
This essentially makes priv->own_thread flag redundant.
SSL_connect()/SSL_accept() is now non-blocking which has done away
with the localised poll() in ssl_do(). So, ssl_do() has been updated
appropriately.
own_thread and coincidently socket_poller() thread for SSL processing
is now deprecated.
Added a timeout to test whether seal-heal daemon is up and running
as per Ravi's suggestion.
Change-Id: If2b5d7b4fd19e321cb289e08d49a718d2161aafe
Signed-off-by: Milind Changire <mchangir@redhat.com>
Diffstat (limited to 'glusterfsd')
| -rw-r--r-- | glusterfsd/src/glusterfsd-mgmt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c index 646b4399019..c5000da4175 100644 --- a/glusterfsd/src/glusterfsd-mgmt.c +++ b/glusterfsd/src/glusterfsd-mgmt.c @@ -245,6 +245,9 @@ glusterfs_handle_terminate (rpcsvc_request_t *req) "terminating after loss of last child %s", xlator_req.name); glusterfs_mgmt_pmap_signout (glusterfsd_ctx, xlator_req.name); + sleep(1); /* to avoid race between above messages and socket + * disconnect notification to glusterd + */ kill (getpid(), SIGTERM); } else { /* |