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/changetimerecorder | |
| 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/changetimerecorder')
| -rw-r--r-- | xlators/features/changetimerecorder/src/changetimerecorder.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/xlators/features/changetimerecorder/src/changetimerecorder.c b/xlators/features/changetimerecorder/src/changetimerecorder.c index 40bfcf4a32a..e97e3ad6cfa 100644 --- a/xlators/features/changetimerecorder/src/changetimerecorder.c +++ b/xlators/features/changetimerecorder/src/changetimerecorder.c @@ -19,6 +19,7 @@ #include "tier-ctr-interface.h" /*******************************inode forget***********************************/ + int ctr_forget (xlator_t *this, inode_t *inode) { @@ -2305,6 +2306,15 @@ notify (xlator_t *this, int event, void *data, ...) if (!priv) goto out; + if (event == GF_EVENT_CLEANUP) { + if (fini_db (priv->_db_conn)) { + gf_msg (this->name, GF_LOG_WARNING, 0, + CTR_MSG_CLOSE_DB_CONN_FAILED, "Failed closing " + "db connection"); + } + if (priv->_db_conn) + priv->_db_conn = NULL; + } ret = default_notify (this, event, data); out: @@ -2345,10 +2355,6 @@ fini (xlator_t *this) CTR_MSG_CLOSE_DB_CONN_FAILED, "Failed closing " "db connection"); } - - if (priv->_db_conn) - priv->_db_conn = NULL; - GF_FREE (priv->ctr_db_path); if (pthread_mutex_destroy (&priv->compact_lock)) { gf_msg (this->name, GF_LOG_WARNING, 0, @@ -2358,7 +2364,6 @@ fini (xlator_t *this) } GF_FREE (priv); mem_pool_destroy (this->local_pool); - this->local_pool = NULL; return; } |