andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpc: fix possible deadlock left behind in d448fd1

Browse Source 
See http://review.gluster.org/9613 for more details.

Change-Id: I05ac0267b8c6f4e9b354acbbdf5469835455fb10
Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com>
Reviewed-on: http://review.gluster.org/10821
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
This commit is contained in:
Krishnan Parthasarathi 2015-05-19 15:01:08 +05:30 committed by Raghavendra G
parent 1b9a2edf2c
commit e902df70f8
3 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/rpc-lib/src/rpc-clnt-ping.c
View File

@ -70,8 +70,8 @@ __rpc_clnt_rearm_ping_timer (struct rpc_clnt *rpc, gf_timer_cbk_t cbk)
} }
/* Must be called under conn->lock */ /* Must be called under conn->lock */
static int int
__rpc_clnt_remove_ping_timer (struct rpc_clnt *rpc) rpc_clnt_remove_ping_timer_locked (struct rpc_clnt *rpc)
{ {
rpc_clnt_connection_t *conn = &rpc->conn; rpc_clnt_connection_t *conn = &rpc->conn;
gf_timer_t *timer = NULL; gf_timer_t *timer = NULL;
@ -117,7 +117,7 @@ rpc_clnt_ping_timer_expired (void *rpc_ptr)
pthread_mutex_lock (&conn->lock); pthread_mutex_lock (&conn->lock);
{ {
unref = __rpc_clnt_remove_ping_timer (rpc); unref = rpc_clnt_remove_ping_timer_locked (rpc);
gettimeofday (&current, NULL); gettimeofday (&current, NULL);
if (((current.tv_sec - conn->last_received.tv_sec) < if (((current.tv_sec - conn->last_received.tv_sec) <
@ -188,7 +188,7 @@ rpc_clnt_ping_cbk (struct rpc_req *req, struct iovec *iov, int count,
pthread_mutex_lock (&conn->lock); pthread_mutex_lock (&conn->lock);
{ {
if (req->rpc_status == -1) { if (req->rpc_status == -1) {
unref = __rpc_clnt_remove_ping_timer (rpc); unref = rpc_clnt_remove_ping_timer_locked (rpc);
if (unref) { if (unref) {
gf_log (this->name, GF_LOG_WARNING, gf_log (this->name, GF_LOG_WARNING,
"socket or ib related error"); "socket or ib related error");
@ -203,7 +203,7 @@ rpc_clnt_ping_cbk (struct rpc_req *req, struct iovec *iov, int count,
goto unlock; goto unlock;
} }
unref = __rpc_clnt_remove_ping_timer (rpc); unref = rpc_clnt_remove_ping_timer_locked (rpc);
if (__rpc_clnt_rearm_ping_timer (rpc, if (__rpc_clnt_rearm_ping_timer (rpc,
rpc_clnt_start_ping) == -1) { rpc_clnt_start_ping) == -1) {
gf_log (this->name, GF_LOG_WARNING, gf_log (this->name, GF_LOG_WARNING,
@ -275,7 +275,7 @@ rpc_clnt_start_ping (void *rpc_ptr)
pthread_mutex_lock (&conn->lock); pthread_mutex_lock (&conn->lock);
{ {
unref = __rpc_clnt_remove_ping_timer (rpc); unref = rpc_clnt_remove_ping_timer_locked (rpc);
if (conn->saved_frames) { if (conn->saved_frames) {
GF_ASSERT (conn->saved_frames->count >= 0); GF_ASSERT (conn->saved_frames->count >= 0);

2
rpc/rpc-lib/src/rpc-clnt-ping.h
View File

@ -12,3 +12,5 @@
#define RPC_DEFAULT_PING_TIMEOUT 30 #define RPC_DEFAULT_PING_TIMEOUT 30
void void
rpc_clnt_check_and_start_ping (struct rpc_clnt *rpc_ptr); rpc_clnt_check_and_start_ping (struct rpc_clnt *rpc_ptr);
int
rpc_clnt_remove_ping_timer_locked (struct rpc_clnt *rpc);

30
rpc/rpc-lib/src/rpc-clnt.c
View File

@ -495,6 +495,7 @@ rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn)
{ {
struct saved_frames *saved_frames = NULL; struct saved_frames *saved_frames = NULL;
struct rpc_clnt *clnt = NULL; struct rpc_clnt *clnt = NULL;
int unref = 0;
if (!conn) { if (!conn) {
goto out; goto out;
@ -516,12 +517,7 @@ rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn)
conn->connected = 0; conn->connected = 0;
if (conn->ping_timer) { unref = rpc_clnt_remove_ping_timer_locked (clnt);
gf_timer_call_cancel (clnt->ctx, conn->ping_timer);
conn->ping_timer = NULL;
conn->ping_started = 0;
rpc_clnt_unref (clnt);
}
/*reset rpc msgs stats*/ /*reset rpc msgs stats*/
conn->pingcnt = 0; conn->pingcnt = 0;
conn->msgcnt = 0; conn->msgcnt = 0;
@ -529,6 +525,8 @@ rpc_clnt_connection_cleanup (rpc_clnt_connection_t *conn)
pthread_mutex_unlock (&conn->lock); pthread_mutex_unlock (&conn->lock);
saved_frames_destroy (saved_frames); saved_frames_destroy (saved_frames);
if (unref)
rpc_clnt_unref (clnt);
out: out:
return 0; return 0;
@ -1709,6 +1707,7 @@ rpc_clnt_disable (struct rpc_clnt *rpc)
{ {
rpc_clnt_connection_t *conn = NULL; rpc_clnt_connection_t *conn = NULL;
rpc_transport_t *trans = NULL; rpc_transport_t *trans = NULL;
int unref = 0;
if (!rpc) { if (!rpc) {
goto out; goto out;
@ -1731,12 +1730,7 @@ rpc_clnt_disable (struct rpc_clnt *rpc)
} }
conn->connected = 0; conn->connected = 0;
if (conn->ping_timer) { unref = rpc_clnt_remove_ping_timer_locked (rpc);
gf_timer_call_cancel (rpc->ctx, conn->ping_timer);
conn->ping_timer = NULL;
conn->ping_started = 0;
rpc_clnt_unref (rpc);
}
trans = conn->trans; trans = conn->trans;
conn->trans = NULL; conn->trans = NULL;
@ -1747,6 +1741,9 @@ rpc_clnt_disable (struct rpc_clnt *rpc)
rpc_transport_disconnect (trans); rpc_transport_disconnect (trans);
} }
if (unref)
rpc_clnt_unref (rpc);
out: out:
return; return;
} }
@ -1756,6 +1753,7 @@ rpc_clnt_disconnect (struct rpc_clnt *rpc)
{ {
rpc_clnt_connection_t *conn = NULL; rpc_clnt_connection_t *conn = NULL;
rpc_transport_t *trans = NULL; rpc_transport_t *trans = NULL;
int unref = 0;
if (!rpc) if (!rpc)
goto out; goto out;
@ -1776,11 +1774,7 @@ rpc_clnt_disconnect (struct rpc_clnt *rpc)
} }
conn->connected = 0; conn->connected = 0;
if (conn->ping_timer) { unref = rpc_clnt_remove_ping_timer_locked (rpc);
gf_timer_call_cancel (rpc->ctx, conn->ping_timer);
conn->ping_timer = NULL;
conn->ping_started = 0;
}
trans = conn->trans; trans = conn->trans;
} }
pthread_mutex_unlock (&conn->lock); pthread_mutex_unlock (&conn->lock);
@ -1788,6 +1782,8 @@ rpc_clnt_disconnect (struct rpc_clnt *rpc)
if (trans) { if (trans) {
rpc_transport_disconnect (trans); rpc_transport_disconnect (trans);
} }
if (unref)
rpc_clnt_unref (rpc);
out: out:
return; return;