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/protocol/server/src | |
| 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/protocol/server/src')
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 7 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index 21f78a38af4..91d5c030341 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -3487,6 +3487,13 @@ rpc_receive_common (rpcsvc_request_t *req, call_frame_t **fr, SERVER_REQ_SET_ERROR (req, ret); goto out; } + + if (!(*fr)->root->client->bound_xl->itable) { + /* inode_table is not allocated successful in server_setvolume */ + SERVER_REQ_SET_ERROR (req, ret); + goto out; + } + ret = 0; out: diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 6dc9d0fffb0..6fcbbd6060d 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -1569,9 +1569,8 @@ notify (xlator_t *this, int32_t event, void *data, ...) (*trav_p) = (*trav_p)->next; glusterfs_mgmt_pmap_signout (ctx, victim->name); + /* we need the protocol/server xlator here as 'this' */ glusterfs_autoscale_threads (THIS->ctx, -1); - default_notify (victim, GF_EVENT_CLEANUP, data); - } break; |