summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorAmar Tumballi <amarts@redhat.com>2012-03-19 18:10:34 +0530
committerVijay Bellur <vijay@gluster.com>2012-03-19 09:14:40 -0700
commitd98c3e19342be3b8b3e2c7e3d7e544de34143bdf (patch)
treeba1d1d18d33694c99749dd005d0d46e91020e7e1 /xlators/protocol
parent55c22fbfae259bff3b0e0cca192f709b74d8bee5 (diff)
rpc-clnt: separate out connection_cleanup() from destroy()v3.3.0qa30
noticed that there are possibilities where one would like to do a connection_cleanup() before destroying a RPC connection itself, also current code is such that, rpc_clnt_connection_cleanup() does rpc_clnt_ref() and unref(), creating a race window/double unref possibilities in the code. by separating out the functions, this race window/double fault can be prevented. Change-Id: I7ebd3392efa891232857b6db9108b0b19e40fc12 Signed-off-by: Amar Tumballi <amarts@redhat.com> BUG: 802403 Reviewed-on: http://review.gluster.com/2979 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 078e6e5d044..93394ebfbfb 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -2199,6 +2199,9 @@ client_destroy_rpc (xlator_t *this)
goto out;
if (conf->rpc) {
+ /* cleanup the saved-frames before last unref */
+ rpc_clnt_connection_cleanup (&conf->rpc->conn);
+
conf->rpc = rpc_clnt_unref (conf->rpc);
ret = 0;
gf_log (this->name, GF_LOG_DEBUG,
@@ -2434,8 +2437,12 @@ fini (xlator_t *this)
this->private = NULL;
if (conf) {
- if (conf->rpc)
- rpc_clnt_unref (conf->rpc);
+ if (conf->rpc) {
+ /* cleanup the saved-frames before last unref */
+ rpc_clnt_connection_cleanup (&conf->rpc->conn);
+
+ rpc_clnt_unref (conf->rpc);
+ }
/* Saved Fds */
/* TODO: */