summaryrefslogtreecommitdiffstats
path: root/xlators/features/quota
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawa@redhat.com>2018-02-10 12:25:15 +0530
committerjiffin tony Thottan <jthottan@redhat.com>2018-04-06 12:47:34 +0000
commit479bea17e75d8e75a8901d01b3fd3627bfd8991c (patch)
tree650a420f504ef22ea2f13fbfba63f73ca860c663 /xlators/features/quota
parent0e3206c6a8ef36737e5b303580b87a87f6dc1c8e (diff)
glusterfsd: Memleak in glusterfsd process while brick mux is on
Problem: At the time of stopping the volume while brick multiplex is enabled memory is not cleanup from all server side xlators. Solution: To cleanup memory for all server side xlators call fini in glusterfs_handle_terminate after send GF_EVENT_CLEANUP notification to top xlator. > BUG: 1544090 > Signed-off-by: Mohit Agrawal <moagrawa@redhat.com> > (cherry picked from commit 7c3cc485054e4ede1efb358552135b432fb7047a) >Note: Run all test-cases in separate build (https://review.gluster.org/19574) > with same patch after enable brick mux forcefully, all test cases are > passed. BUG: 1549473 Signed-off-by: Mohit Agrawal <moagrawa@redhat.com> Change-Id: Ia10dc7f2605aa50f2b90b3fe4eb380ba9299e2fc
Diffstat (limited to 'xlators/features/quota')
-rw-r--r--xlators/features/quota/src/quota.c25
1 files changed, 24 insertions, 1 deletions
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
index a3078453f78..8a173ba9074 100644
--- a/xlators/features/quota/src/quota.c
+++ b/xlators/features/quota/src/quota.c
@@ -5194,12 +5194,14 @@ quota_priv_dump (xlator_t *this)
GF_ASSERT (this);
priv = this->private;
+ if (!priv)
+ goto out;
gf_proc_dump_add_section ("xlators.features.quota.priv", this->name);
ret = TRY_LOCK (&priv->lock);
if (ret)
- goto out;
+ goto out;
else {
gf_proc_dump_write("soft-timeout", "%d", priv->soft_timeout);
gf_proc_dump_write("hard-timeout", "%d", priv->hard_timeout);
@@ -5219,6 +5221,27 @@ out:
void
fini (xlator_t *this)
{
+ quota_priv_t *priv = NULL;
+ rpc_clnt_t *rpc = NULL;
+ int i = 0, cnt = 0;
+
+ priv = this->private;
+ if (!priv)
+ return;
+ rpc = priv->rpc_clnt;
+ priv->rpc_clnt = NULL;
+ this->private = NULL;
+ if (rpc) {
+ cnt = rpc->refcount;
+ for (i = 0; i < cnt; i++)
+ rpc_clnt_unref (rpc);
+ }
+ LOCK_DESTROY (&priv->lock);
+ GF_FREE (priv);
+ if (this->local_pool) {
+ mem_pool_destroy (this->local_pool);
+ this->local_pool = NULL;
+ }
return;
}