From 12285e76e8f93ef6f6aa2611869bd1f40955dc9e Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Wed, 21 Nov 2018 19:02:42 +0530 Subject: core: Resolve memory leak at the time of graph init Problem: In the commit 751b14f2bfd40e08ad395ccd98c6eb0a41ac4e91 one code path is missed to avoid leak at the time of calling graph init Solution: Before destroying graph call xlator fini to avoid leak for server-side xlators those call init during graph init Credit: Pranith Kumar Karampuri fixes: bz#1651431 Change-Id: I6e7cff0d792ab9d954524b28667e94f2d9ec19a2 Signed-off-by: Mohit Agrawal --- glusterfsd/src/glusterfsd.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) (limited to 'glusterfsd') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 106bfe3bcc1..a1626a81e9f 100644 --- a/glusterfsd/src/glusterfsd.c +++ b/glusterfsd/src/glusterfsd.c @@ -2537,6 +2537,24 @@ out: } #endif +int +glusterfs_graph_fini(glusterfs_graph_t *graph) +{ + xlator_t *trav = NULL; + + trav = graph->first; + + while (trav) { + if (trav->init_succeeded) { + trav->fini(trav); + trav->init_succeeded = 0; + } + trav = trav->next; + } + + return 0; +} + int glusterfs_process_volfp(glusterfs_ctx_t *ctx, FILE *fp) { @@ -2584,10 +2602,23 @@ out: fclose(fp); if (ret) { - if (graph && (ctx && (ctx->active != graph))) - glusterfs_graph_destroy(graph); + /* TODO This code makes to generic for all graphs + client as well as servers.For now it destroys + graph only for server-side xlators not for client-side + xlators, before destroying a graph call xlator fini for + xlators those call xlator_init to avoid leak + */ + if (graph) { + xl = graph->first; + if ((ctx && (ctx->active != graph)) && + (xl && !strcmp(xl->type, "protocol/server"))) { + glusterfs_graph_fini(graph); + glusterfs_graph_destroy(graph); + } + } + /* there is some error in setting up the first graph itself */ - if (!ctx->active) { + if (!ctx || !ctx->active) { emancipate(ctx, ret); cleanup_and_exit(ret); } -- cgit