summaryrefslogtreecommitdiffstats
path: root/xlators/features/leases/src/leases.c
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawa@redhat.com>2018-02-10 12:25:15 +0530
committerJeff Darcy <jeff@pl.atyp.us>2018-02-15 17:03:20 +0000
commitb313d97faa766443a7f8128b6e19f3d2f1b267dd (patch)
tree6af84081aee75fa08c8ceecde4c15a2791863e52 /xlators/features/leases/src/leases.c
parent9d0d1fdd091d754149242fd4389b964695aacf13 (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 Change-Id: Ifa1525e25b697371276158705026b421b4f81140 Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'xlators/features/leases/src/leases.c')
-rw-r--r--xlators/features/leases/src/leases.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/xlators/features/leases/src/leases.c b/xlators/features/leases/src/leases.c
index d4fdbfb7ea1..ebee682a685 100644
--- a/xlators/features/leases/src/leases.c
+++ b/xlators/features/leases/src/leases.c
@@ -1041,14 +1041,17 @@ fini (xlator_t *this)
priv->fini = _gf_true;
pthread_cond_broadcast (&priv->cond);
- pthread_join (priv->recall_thr, NULL);
-
- priv->inited_recall_thr = _gf_false;
+ if (priv->recall_thr) {
+ gf_thread_cleanup_xint (priv->recall_thr);
+ priv->recall_thr = 0;
+ priv->inited_recall_thr = _gf_false;
+ }
GF_FREE (priv);
-
- glusterfs_ctx_tw_put (this->ctx);
-
+ if (this->ctx->tw) {
+ glusterfs_ctx_tw_put (this->ctx);
+ this->ctx->tw = NULL;
+ }
return 0;
}