diff options
| author | Jiffin Tony Thottan <jthottan@redhat.com> | 2017-02-22 14:20:41 +0530 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-04-24 10:31:32 +0000 |
| commit | c8e1c2d9382bd57fbdcc491e21fe24be3d4a1252 (patch) | |
| tree | 1658631d18e1ac429191a9d72a375824406d386f | |
| parent | ad1d35239219a004358c37895d1f1dc1643acb1f (diff) | |
glusterd/ganesha : During volume delete remove the ganesha export configuration file
Change-Id: I0363e7f4d7cefd3f1b3c4f91e495767ec52e230e
BUG: 1425723
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: https://review.gluster.org/16707
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: soumya k <skoduri@redhat.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ganesha.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c index f7b7f1371e5..2e62f9d7ba1 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c @@ -464,7 +464,7 @@ manage_export_config (char *volname, char *value, char **op_errstr) CONFDIR, value, volname, NULL); ret = runner_run(&runner); - if (ret) + if (ret && !(*op_errstr)) gf_asprintf (op_errstr, "Failed to create" " NFS-Ganesha export config file."); diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index ad5fe909578..96b9aaf93d5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -2823,6 +2823,14 @@ glusterd_op_delete_volume (dict_t *dict) if (ret) goto out; + if (glusterd_check_ganesha_export (volinfo)) { + ret = manage_export_config (volname, "off", NULL); + if (ret) + gf_msg (this->name, GF_LOG_WARNING, 0, 0, + "Could not delete ganesha export conf file " + "for %s", volname); + } + ret = glusterd_delete_volume (volinfo); out: gf_msg_debug (this->name, 0, "returning %d", ret); |