|
 |
e7a346 |
From 1a9717eb9fb0c6ebd4fce5aa85e3ed53bdd69d59 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
Date: Wed, 22 Feb 2017 14:20:41 +0530
|
|
|
e7a346 |
Subject: [PATCH 54/74] glusterd/ganesha : During volume delete remove the
|
|
|
e7a346 |
ganesha export configuration file
|
|
|
e7a346 |
|
|
|
e7a346 |
Change-Id: I0363e7f4d7cefd3f1b3c4f91e495767ec52e230e
|
|
|
e7a346 |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://review.gluster.org/16707
|
|
|
e7a346 |
Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
e7a346 |
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
e7a346 |
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
e7a346 |
Reviewed-by: soumya k <skoduri@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
e7a346 |
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
xlators/mgmt/glusterd/src/glusterd-ganesha.c | 2 +-
|
|
|
e7a346 |
xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 8 ++++++++
|
|
|
e7a346 |
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
e7a346 |
index c16dd72..e176df9 100644
|
|
|
e7a346 |
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
e7a346 |
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
|
|
|
e7a346 |
@@ -464,7 +464,7 @@ manage_export_config (char *volname, char *value, char **op_errstr)
|
|
|
e7a346 |
CONFDIR, value, volname, NULL);
|
|
|
e7a346 |
ret = runner_run(&runner);
|
|
|
e7a346 |
|
|
|
e7a346 |
- if (ret)
|
|
|
e7a346 |
+ if (ret && !(*op_errstr))
|
|
|
e7a346 |
gf_asprintf (op_errstr, "Failed to create"
|
|
|
e7a346 |
" NFS-Ganesha export config file.");
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
|
|
|
e7a346 |
index 0914fb1..92db458 100644
|
|
|
e7a346 |
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
|
|
|
e7a346 |
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
|
|
|
e7a346 |
@@ -2853,6 +2853,14 @@ glusterd_op_delete_volume (dict_t *dict)
|
|
|
e7a346 |
volname);
|
|
|
e7a346 |
goto out;
|
|
|
e7a346 |
}
|
|
|
e7a346 |
+ if (glusterd_check_ganesha_export (volinfo)) {
|
|
|
e7a346 |
+ ret = manage_export_config (volname, "off", NULL);
|
|
|
e7a346 |
+ if (ret)
|
|
|
e7a346 |
+ gf_msg (this->name, GF_LOG_WARNING, 0, 0,
|
|
|
e7a346 |
+ "Could not delete ganesha export conf file "
|
|
|
e7a346 |
+ "for %s", volname);
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
+
|
|
|
e7a346 |
|
|
|
e7a346 |
ret = glusterd_delete_volume (volinfo);
|
|
|
e7a346 |
out:
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|