diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2018-02-10 12:25:15 +0530 | 
|---|---|---|
| committer | jiffin tony Thottan <jthottan@redhat.com> | 2018-04-06 12:47:34 +0000 | 
| commit | 479bea17e75d8e75a8901d01b3fd3627bfd8991c (patch) | |
| tree | 650a420f504ef22ea2f13fbfba63f73ca860c663 /xlators/features/index/src/index.c | |
| parent | 0e3206c6a8ef36737e5b303580b87a87f6dc1c8e (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/index/src/index.c')
| -rw-r--r-- | xlators/features/index/src/index.c | 21 | 
1 files changed, 12 insertions, 9 deletions
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c index 8590482a5b3..f3b02706cdd 100644 --- a/xlators/features/index/src/index.c +++ b/xlators/features/index/src/index.c @@ -2444,6 +2444,13 @@ fini (xlator_t *this)          priv = this->private;          if (!priv)                  goto out; + +        priv->down = _gf_true; +        pthread_cond_broadcast (&priv->cond); +        if (priv->thread) { +                gf_thread_cleanup_xint (priv->thread); +                priv->thread = 0; +        }          this->private = NULL;          LOCK_DESTROY (&priv->lock);          pthread_cond_destroy (&priv->cond); @@ -2455,8 +2462,11 @@ fini (xlator_t *this)          if (priv->complete_watchlist)                  dict_unref (priv->complete_watchlist);          GF_FREE (priv); -        mem_pool_destroy (this->local_pool); -        this->local_pool = NULL; + +        if (this->local_pool) { +                mem_pool_destroy (this->local_pool); +                this->local_pool = NULL; +        }  out:          return;  } @@ -2526,13 +2536,6 @@ notify (xlator_t *this, int event, void *data, ...)          if (!priv)                  return 0; -        switch (event) { -        case GF_EVENT_CLEANUP: -                priv->down = _gf_true; -                pthread_cond_broadcast (&priv->cond); -                break; -        } -          ret = default_notify (this, event, data);          return ret;  }  | 
