diff options
| author | Rajesh Joseph <rjoseph@redhat.com> | 2016-12-13 15:28:42 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2016-12-21 20:49:19 -0800 |
| commit | af6769675acbbfd780fa2ece8587502d6d579372 (patch) | |
| tree | e464f44c08163b9ba84e3d91d1e9d71efd5c04dc /rpc/rpc-transport/socket/src/socket.h | |
| parent | 8b42e1b5688f8600086ecc0e33ac4abf5e7c2772 (diff) | |
socket: socket disconnect should wait for poller thread exit
When SSL is enabled or if "transport.socket.own-thread" option is set
then socket_poller is run as different thread. Currently during
disconnect or PARENT_DOWN scenario we don't wait for this thread
to terminate. PARENT_DOWN will disconnect the socket layer and
cleanup resources used by socket_poller.
Therefore before disconnect we should wait for poller thread to exit.
Change-Id: I71f984b47d260ffd979102f180a99a0bed29f0d6
BUG: 1404181
Signed-off-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-on: http://review.gluster.org/16141
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'rpc/rpc-transport/socket/src/socket.h')
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h index 7c7005b59e7..8528bdeba8d 100644 --- a/rpc/rpc-transport/socket/src/socket.h +++ b/rpc/rpc-transport/socket/src/socket.h @@ -27,6 +27,7 @@ #include "dict.h" #include "mem-pool.h" #include "globals.h" +#include "refcount.h" #ifndef MAX_IOVEC #define MAX_IOVEC 16 @@ -215,6 +216,8 @@ typedef struct { }; struct gf_sock_incoming incoming; pthread_mutex_t lock; + pthread_mutex_t cond_lock; + pthread_cond_t cond; int windowsize; char lowlat; char nodelay; @@ -239,10 +242,13 @@ typedef struct { pthread_t thread; int pipe[2]; gf_boolean_t own_thread; + gf_boolean_t own_thread_done; ot_state_t ot_state; uint32_t ot_gen; gf_boolean_t is_server; int log_ctr; + GF_REF_DECL; /* refcount to keep track of socket_poller + threads */ } socket_private_t; |