diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2018-02-18 08:14:35 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-02-19 19:30:56 +0000 |
| commit | e3e7cdbde5463ff6d20af52329a784ca629c6aef (patch) | |
| tree | 43887efd6a9c624ac204ad6bba6065baba2ab1cf /xlators/features/changelog/src | |
| parent | 8d9961e63786cf8a9bb9e2f4140ab9a77f1ccbe3 (diff) | |
Revert "glusterfsd: Memleak in glusterfsd process while brick mux is on"
There are still remain some code paths where cleanup is required while
brick mux is on.I will upload a new patch after resolve all code paths.
This reverts commit b313d97faa766443a7f8128b6e19f3d2f1b267dd.
BUG: 1544090
Change-Id: I26ef1d29061092bd9a409c8933d5488e968ed90e
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'xlators/features/changelog/src')
| -rw-r--r-- | xlators/features/changelog/src/changelog-rpc-common.c | 4 | ||||
| -rw-r--r-- | xlators/features/changelog/src/changelog.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/xlators/features/changelog/src/changelog-rpc-common.c b/xlators/features/changelog/src/changelog-rpc-common.c index 1745f218b08..7bd5b688fa5 100644 --- a/xlators/features/changelog/src/changelog-rpc-common.c +++ b/xlators/features/changelog/src/changelog-rpc-common.c @@ -275,10 +275,6 @@ 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 21de0fbc0c6..10a149232c2 100644 --- a/xlators/features/changelog/src/changelog.c +++ b/xlators/features/changelog/src/changelog.c @@ -2111,6 +2111,14 @@ 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; @@ -2914,7 +2922,6 @@ fini (xlator_t *this) } this->private = NULL; - this->local_pool = NULL; return; } |