From 7c3cc485054e4ede1efb358552135b432fb7047a Mon Sep 17 00:00:00 2001
From: Mohit Agrawal <moagrawa@redhat.com>
Date: Sat, 10 Feb 2018 12:25:15 +0530
Subject: 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>

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.

Change-Id: Ia10dc7f2605aa50f2b90b3fe4eb380ba9299e2fc
---
 xlators/features/changelog/src/changelog-ev-handle.c  |  8 +++++---
 xlators/features/changelog/src/changelog-rpc-common.c |  4 ++++
 xlators/features/changelog/src/changelog.c            | 12 ++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'xlators/features/changelog')

diff --git a/xlators/features/changelog/src/changelog-ev-handle.c b/xlators/features/changelog/src/changelog-ev-handle.c
index a7f485b019f..b5681944567 100644
--- a/xlators/features/changelog/src/changelog-ev-handle.c
+++ b/xlators/features/changelog/src/changelog-ev-handle.c
@@ -163,12 +163,14 @@ changelog_rpc_notify (struct rpc_clnt *rpc,
                  */
                 rpc_clnt_unref (crpc->rpc);
 
-                selection = &priv->ev_selection;
+                if (priv)
+                        selection = &priv->ev_selection;
 
                 LOCK (&crpc->lock);
                 {
-                        changelog_deselect_event (this, selection,
-                                                  crpc->filter);
+                        if (selection)
+                                changelog_deselect_event (this, selection,
+                                                          crpc->filter);
                         changelog_set_disconnect_flag (crpc, _gf_true);
                 }
                 UNLOCK (&crpc->lock);
diff --git a/xlators/features/changelog/src/changelog-rpc-common.c b/xlators/features/changelog/src/changelog-rpc-common.c
index 7bd5b688fa5..1745f218b08 100644
--- a/xlators/features/changelog/src/changelog-rpc-common.c
+++ b/xlators/features/changelog/src/changelog-rpc-common.c
@@ -275,6 +275,10 @@ changelog_rpc_server_destroy (xlator_t *this, rpcsvc_t *rpc, char *sockfile,
 
         (void) rpcsvc_unregister_notify (rpc, fn, this);
         sys_unlink (sockfile);
+        if (rpc->rxpool) {
+                mem_pool_destroy (rpc->rxpool);
+                rpc->rxpool = NULL;
+        }
 
         GF_FREE (rpc);
 }
diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c
index 10a149232c2..a92e7a1828f 100644
--- a/xlators/features/changelog/src/changelog.c
+++ b/xlators/features/changelog/src/changelog.c
@@ -2111,14 +2111,6 @@ notify (xlator_t *this, int event, void *data, ...)
         if (!priv)
                 goto out;
 
-        if (event == GF_EVENT_CLEANUP) {
-               /* terminate helper threads */
-               changelog_cleanup_helper_threads (this, priv);
-
-               /* terminate RPC server/threads */
-               changelog_cleanup_rpc_threads (this, priv);
-        }
-
         if (event == GF_EVENT_TRANSLATOR_OP) {
 
                 dict = data;
@@ -2912,6 +2904,9 @@ fini (xlator_t *this)
                 /* cleanup barrier related objects */
                 changelog_barrier_pthread_destroy (priv);
 
+                /* cleanup helper threads */
+                changelog_cleanup_helper_threads (this, priv);
+
                 /* cleanup allocated options */
                 changelog_freeup_options (this, priv);
 
@@ -2922,6 +2917,7 @@ fini (xlator_t *this)
         }
 
         this->private = NULL;
+        this->local_pool = NULL;
 
         return;
 }
-- 
cgit