summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/server
diff options
context:
space:
mode:
authorMohit Agrawal <moagrawa@redhat.com>2018-02-10 12:25:15 +0530
committerAmar Tumballi <amarts@redhat.com>2018-02-27 07:11:15 +0000
commit7c3cc485054e4ede1efb358552135b432fb7047a (patch)
tree5657500860f795b7c895bce14069545d8ba463e2 /xlators/protocol/server
parent430bff7dc330eec9447423e95f2cae49744a79c3 (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> 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. Change-Id: Ia10dc7f2605aa50f2b90b3fe4eb380ba9299e2fc
Diffstat (limited to 'xlators/protocol/server')
-rw-r--r--xlators/protocol/server/src/server-rpc-fops.c7
-rw-r--r--xlators/protocol/server/src/server.c1
2 files changed, 7 insertions, 1 deletions
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c
index 2c3f71bb245..8fcc93c788f 100644
--- a/xlators/protocol/server/src/server-rpc-fops.c
+++ b/xlators/protocol/server/src/server-rpc-fops.c
@@ -3486,6 +3486,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 30546e87b8d..758264a638b 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -1507,7 +1507,6 @@ server_notify (xlator_t *this, int32_t event, void *data, ...)
victim->name);
/* we need the protocol/server xlator here as 'this' */
glusterfs_autoscale_threads (ctx, -1, this);
- default_notify (victim, GF_EVENT_CLEANUP, data);
}
break;