From a769be2c0d4227fead7348e769bd1ae49e267971 Mon Sep 17 00:00:00 2001 From: Jiffin Tony Thottan Date: Tue, 12 Jul 2016 17:23:03 +0530 Subject: Revert "glusterd-ganesha : copy ganesha export configuration files during reboot" This reverts commit f71e2fa49af185779b9f43e146effd122d4e9da0. Reason: As part of sync up node reboot this patch copies ganesha export conf file from a source node. This change is no more require if the export files are available in shared storage. Change-Id: Id9c1ae78377bbd7d5d80aa1c14f534e30feaae97 BUG: 1355956 Signed-off-by: Jiffin Tony Thottan Reviewed-on: http://review.gluster.org/14907 Reviewed-by: soumya k Smoke: Gluster Build System CentOS-regression: Gluster Build System NetBSD-regression: NetBSD Build System Reviewed-by: Kaleb KEITHLEY --- xlators/mgmt/glusterd/src/glusterd-utils.c | 32 ------------------------------ 1 file changed, 32 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-utils.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index a458a1c9245..872475e9ab0 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -4092,9 +4092,6 @@ glusterd_import_friend_volume (dict_t *peer_data, size_t count) glusterd_volinfo_t *old_volinfo = NULL; glusterd_volinfo_t *new_volinfo = NULL; glusterd_svc_t *svc = NULL; - gf_boolean_t newexportvalue = _gf_false; - gf_boolean_t oldexportvalue = _gf_false; - char *value = NULL; GF_ASSERT (peer_data); @@ -4115,8 +4112,6 @@ glusterd_import_friend_volume (dict_t *peer_data, size_t count) ret = glusterd_volinfo_find (new_volinfo->volname, &old_volinfo); if (0 == ret) { - oldexportvalue = glusterd_check_ganesha_export (old_volinfo); - /* Ref count the old_volinfo such that deleting it doesn't crash * if its been already in use by other thread */ @@ -4150,33 +4145,6 @@ glusterd_import_friend_volume (dict_t *peer_data, size_t count) } } - ret = glusterd_volinfo_get (new_volinfo, "ganesha.enable", &value); - if (ret) - goto out; - ret = gf_string2boolean (value, &newexportvalue); - if (ret) - goto out; - - /* * - * if new and old export value is off, then there is no point in calling - * ganesha_manage_export - */ - if (!((newexportvalue == oldexportvalue) && - newexportvalue == _gf_false)) { - ret = ganesha_manage_export (new_volinfo->volname, value, - NULL, _gf_true); - if (ret) { - gf_msg (this->name, GF_LOG_ERROR, 0, - GD_MSG_NFS_GNS_OP_HANDLE_FAIL, - "Returning from ganesha_manage_export with" - " ret: %d for volume %s ganesha.enable %s", - ret, new_volinfo->volname, - value); - gf_event (EVENT_NFS_GANESHA_EXPORT_FAILED, "volume=%s", - new_volinfo->volname); - goto out; - } - } ret = glusterd_store_volinfo (new_volinfo, GLUSTERD_VOLINFO_VER_AC_NONE); if (ret) { gf_msg (this->name, GF_LOG_ERROR, 0, -- cgit