summaryrefslogtreecommitdiffstats
path: root/xlators/features/changelog/src
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/changelog/src
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/changelog/src')
-rw-r--r--xlators/features/changelog/src/changelog-ev-handle.c8
-rw-r--r--xlators/features/changelog/src/changelog-rpc-common.c4
-rw-r--r--xlators/features/changelog/src/changelog.c19
3 files changed, 13 insertions, 18 deletions
diff --git a/xlators/features/changelog/src/changelog-ev-handle.c b/xlators/features/changelog/src/changelog-ev-handle.c
index 38e127b7eb5..3e8dc9acd04 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 08cd41e4f17..21bef76ef35 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 8b22a049dc9..31894c1cc28 100644
--- a/xlators/features/changelog/src/changelog.c
+++ b/xlators/features/changelog/src/changelog.c
@@ -2102,7 +2102,6 @@ notify (xlator_t *this, int event, void *data, ...)
int ret = 0;
int ret1 = 0;
struct list_head queue = {0, };
- int i = 0;
INIT_LIST_HEAD (&queue);
@@ -2110,20 +2109,6 @@ notify (xlator_t *this, int event, void *data, ...)
if (!priv)
goto out;
- if (event == GF_EVENT_CLEANUP) {
- if (priv->connector) {
- (void) gf_thread_cleanup_xint (priv->connector);
- priv->connector = 0;
- }
-
- for (; i < NR_DISPATCHERS; i++) {
- if (priv->ev_dispatcher[i]) {
- (void) gf_thread_cleanup_xint (priv->ev_dispatcher[i]);
- priv->ev_dispatcher[i] = 0;
- }
- }
- }
-
if (event == GF_EVENT_TRANSLATOR_OP) {
dict = data;
@@ -2901,6 +2886,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);
@@ -2911,6 +2899,7 @@ fini (xlator_t *this)
}
this->private = NULL;
+ this->local_pool = NULL;
return;
}