diff options
author | root <root@dhcp35-131.lab.eng.blr.redhat.com> | 2016-07-05 14:33:15 +0530 |
---|---|---|
committer | Atin Mukherjee <amukherj@redhat.com> | 2016-08-03 20:58:38 -0700 |
commit | 058ccf9520794280f3fc254de00e3f604e3cfbb7 (patch) | |
tree | d8e7d7bf8179c58b8a2b65302eb92273c62f3639 /xlators/mgmt | |
parent | ed65746f802351af591d218bdc3f462b787bee23 (diff) |
glusterd: Fix memory leak in glusterd (un)lock RPCs
Problem: At the time of execute "gluster volume profile <vol> info" command
It does have memory leak in glusterd.
Solution: Modify the code to prevent memory leak in glusterd.
Fix : 1) Unref dict and free dict_val buffer in glusterd_mgmt_v3_lock_peer and
glusterd_mgmt_v3_unlock_peers.
Test : To verify the patch run below loop to generate io traffic
for (( i=0 ; i<=1000000 ; i++ ));
do echo "hi Start Line " > file$i;
cat file$i >> /dev/null;
done
To verify the improvement in memory leak specific to glusterd run below command
cnt=0;while [ $cnt -le 1000 ]; do
pmap -x <glusterd-pid> | grep total;
gluster volume profile distributed info > /dev/null; cnt=`expr $cnt + 1`; done
After apply this patch it will reduce leak significantly.
> Reviewed-on: http://review.gluster.org/14862
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
> Reviewed-by: Prashanth Pai <ppai@redhat.com>
BUG: 1363747
Change-Id: I52a0ca47adb20bfe4b1848a11df23e5e37c5cea9
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Reviewed-on: http://review.gluster.org/15081
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>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-rpc-ops.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c index ffe678b0ff2..73f70476310 100644 --- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c @@ -1789,6 +1789,10 @@ glusterd_mgmt_v3_lock_peers (call_frame_t *frame, xlator_t *this, (xdrproc_t)xdr_gd1_mgmt_v3_lock_req); out: gf_msg_debug (this->name, 0, "Returning %d", ret); + if (dict) + dict_unref (dict); + if (req.dict.dict_val) + GF_FREE (req.dict.dict_val); return ret; } @@ -1866,6 +1870,11 @@ glusterd_mgmt_v3_unlock_peers (call_frame_t *frame, xlator_t *this, xdr_gd1_mgmt_v3_unlock_req); out: gf_msg_debug (this->name, 0, "Returning %d", ret); + if (dict) + dict_unref(dict); + + if (req.dict.dict_val) + GF_FREE (req.dict.dict_val); return ret; } |