diff options
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ganesha.c | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 14 |
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: |