|
 |
887953 |
From 597826a5fa4e307a23615a03031d2df0f739652f Mon Sep 17 00:00:00 2001
|
|
|
887953 |
From: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
887953 |
Date: Tue, 20 Nov 2018 15:55:31 +0530
|
|
|
887953 |
Subject: [PATCH 448/450] core: Resolve memory leak at the time of graph init
|
|
|
887953 |
|
|
|
887953 |
Problem: Memory leak when graph init fails as during volfile
|
|
|
887953 |
exchange between brick and glusterd
|
|
|
887953 |
|
|
|
887953 |
Solution: Fix the error code path in glusterfs_graph_init
|
|
|
887953 |
|
|
|
887953 |
> Change-Id: If62bee61283fccb7fd60abc6ea217cfac12358fa
|
|
|
887953 |
> fixes: bz#1651431
|
|
|
887953 |
> Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
887953 |
> (cherry pick from commit 751b14f2bfd40e08ad395ccd98c6eb0a41ac4e91)
|
|
|
887953 |
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/21658/)
|
|
|
887953 |
|
|
|
887953 |
Change-Id: I29fd290e71754214cc242eac0cc9461d18abec81
|
|
|
887953 |
BUG: 1650138
|
|
|
887953 |
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
887953 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/156358
|
|
|
887953 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
887953 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
887953 |
---
|
|
|
887953 |
glusterfsd/src/glusterfsd.c | 11 +++++++----
|
|
|
887953 |
xlators/mgmt/glusterd/src/glusterd.c | 4 ----
|
|
|
887953 |
2 files changed, 7 insertions(+), 8 deletions(-)
|
|
|
887953 |
|
|
|
887953 |
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
|
|
|
887953 |
index 6b7adc4..262a0c1 100644
|
|
|
887953 |
--- a/glusterfsd/src/glusterfsd.c
|
|
|
887953 |
+++ b/glusterfsd/src/glusterfsd.c
|
|
|
887953 |
@@ -2383,11 +2383,14 @@ out:
|
|
|
887953 |
if (fp)
|
|
|
887953 |
fclose (fp);
|
|
|
887953 |
|
|
|
887953 |
- if (ret && !ctx->active) {
|
|
|
887953 |
- glusterfs_graph_destroy (graph);
|
|
|
887953 |
+ if (ret) {
|
|
|
887953 |
+ if (graph && (ctx && (ctx->active != graph)))
|
|
|
887953 |
+ glusterfs_graph_destroy (graph);
|
|
|
887953 |
/* there is some error in setting up the first graph itself */
|
|
|
887953 |
- emancipate (ctx, ret);
|
|
|
887953 |
- cleanup_and_exit (ret);
|
|
|
887953 |
+ if (!ctx->active) {
|
|
|
887953 |
+ emancipate (ctx, ret);
|
|
|
887953 |
+ cleanup_and_exit (ret);
|
|
|
887953 |
+ }
|
|
|
887953 |
}
|
|
|
887953 |
|
|
|
887953 |
return ret;
|
|
|
887953 |
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
|
|
|
887953 |
index 076019f..ca17526 100644
|
|
|
887953 |
--- a/xlators/mgmt/glusterd/src/glusterd.c
|
|
|
887953 |
+++ b/xlators/mgmt/glusterd/src/glusterd.c
|
|
|
887953 |
@@ -1120,10 +1120,6 @@ glusterd_init_uds_listener (xlator_t *this)
|
|
|
887953 |
strncpy (sockfile, sock_data->data, UNIX_PATH_MAX);
|
|
|
887953 |
}
|
|
|
887953 |
|
|
|
887953 |
- options = dict_new ();
|
|
|
887953 |
- if (!options)
|
|
|
887953 |
- goto out;
|
|
|
887953 |
-
|
|
|
887953 |
ret = rpcsvc_transport_unix_options_build (&options, sockfile);
|
|
|
887953 |
if (ret)
|
|
|
887953 |
goto out;
|
|
|
887953 |
--
|
|
|
887953 |
1.8.3.1
|
|
|
887953 |
|