summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorMeghana M <mmadhusu@redhat.com>2015-06-15 08:43:44 +0000
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-06-16 05:50:14 -0700
commit4a829e33d9c0d62a710650337406dc25d89cc599 (patch)
tree65673e0eb6515104fced6d389a1bc8b29f554d2a /xlators/mgmt
parenta9f58cd6cfc29a47af868fff29ce3133b9f9efe5 (diff)
NFS-Ganesha: Automatically export vol that was exported before vol restart
Consider a volume that is exported via NFS-Ganesha. Stopping this volume will automatically unexport the volume. Starting this volume should automatically export it. Although the logic was already there, there was a bug in it. Fixing the same by introducing a hook script. Also with the new CLI options, the hook script S31ganesha-set.sh is no longer required. Hence, removing the same. Adding a comment to tell the user that one of the CLI commands will take a few minutes to complete. Change-Id: Ibff769ca04fef0c2a129c83fe31fc9c869350e8d BUG: 1231738 Signed-off-by: Meghana Madhusudhan <mmadhusu@redhat.com> Reviewed-on: http://review.gluster.org/11247 Reviewed-by: soumya k <skoduri@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-ganesha.c3
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-ops.c14
2 files changed, 4 insertions, 13 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
index 10f7c769b8c..ff061209a30 100644
--- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c
+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c
@@ -506,9 +506,10 @@ ganesha_manage_export (dict_t *dict, char *value, char **op_errstr)
goto out;
}
}
+
+ vol_opts = volinfo->dict;
/* cache-invalidation should be on when a volume is exported
* and off when a volume is unexported. */
- vol_opts = volinfo->dict;
ret = dict_set_dynstr_with_alloc (vol_opts,
"features.cache-invalidation", value);
if (ret)
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index aadbb10681e..13daceb42ad 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -1573,7 +1573,7 @@ glusterd_op_stage_stop_volume (dict_t *dict, char **op_errstr)
if (ret) {
ret = ganesha_manage_export(dict, "off", op_errstr);
if (ret) {
- gf_log (THIS->name, GF_LOG_WARNING, "Could not"
+ gf_log (THIS->name, GF_LOG_WARNING, "Could not "
"unexport volume via NFS-Ganesha");
ret = 0;
}
@@ -2424,17 +2424,7 @@ glusterd_op_start_volume (dict_t *dict, char **op_errstr)
if (ret)
goto out;
}
- /* Check if the volume is exported via NFS-Ganesha, if yes
- * export it as part of starting the volume */
- ret = glusterd_check_ganesha_export (volinfo);
- if (ret) {
- ret = ganesha_manage_export (dict, "on", op_errstr);
- if (ret) {
- gf_log ("glusterd", GF_LOG_WARNING, "NFS-Ganesha couldn't"
- "export the volume. %s", *op_errstr);
- ret = 0;
- }
- }
+
ret = glusterd_svcs_manager (volinfo);
out: