diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2018-05-23 09:10:11 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-05-25 02:05:37 +0000 |
| commit | b679fd4b73d9ec039029088769722887b61d750a (patch) | |
| tree | 1fba7b4d16dea3ffa8808475d5d5cb44a3256bd1 /xlators/protocol | |
| parent | 7b95d5a4b3988757bf8c91f82dcaf86ed3da6875 (diff) | |
Revert "glusterfsd: Memleak in glusterfsd process while brick mux is on"
Updates: bz#1582286
This reverts commit 7c3cc485054e4ede1efb358552135b432fb7047a.
Change-Id: I831d646112bcfa13d0c2153482ad00ff1b23aa6c
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'xlators/protocol')
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 1 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index 7554984f80e..c015a246a6c 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -3516,7 +3516,6 @@ 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); diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index c71ad89b870..4c94a324f2c 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -1419,7 +1419,7 @@ server_notify (xlator_t *this, int32_t event, void *data, ...) case GF_EVENT_CHILD_UP: { list_for_each_entry (tmp, &conf->child_status->status_list, - status_list) { + status_list) { if (tmp->name == NULL) break; if (strcmp (tmp->name, victim->name) == 0) @@ -1434,7 +1434,7 @@ server_notify (xlator_t *this, int32_t event, void *data, ...) tmp->name = gf_strdup (victim->name); tmp->child_up = _gf_true; list_add_tail (&tmp->status_list, - &conf->child_status->status_list); + &conf->child_status->status_list); } ret = server_process_child_event (this, event, data, GF_CBK_CHILD_UP); @@ -1451,7 +1451,7 @@ server_notify (xlator_t *this, int32_t event, void *data, ...) case GF_EVENT_CHILD_DOWN: { list_for_each_entry (tmp, &conf->child_status->status_list, - status_list) { + status_list) { if (strcmp (tmp->name, victim->name) == 0) { tmp->child_up = _gf_false; break; @@ -1514,7 +1514,7 @@ server_notify (xlator_t *this, int32_t event, void *data, ...) trav_p = &(*trav_p)->next) { travxl = (*trav_p)->xlator; if (travxl && - strcmp (travxl->name, victim->name) == 0) { + strcmp (travxl->name, victim->name) == 0) { victim_found = _gf_true; break; } @@ -1527,7 +1527,8 @@ server_notify (xlator_t *this, int32_t event, void *data, ...) (*trav_p) = (*trav_p)->next; rpc_clnt_mgmt_pmap_signout (ctx, victim->name); /* we need the protocol/server xlator here as 'this' */ - rpcsvc_autoscale_threads (ctx, conf->rpc, -1); + glusterfs_autoscale_threads (ctx, -1, this); + default_notify (victim, GF_EVENT_CLEANUP, data); } break; |