From e5db9f2ea99770e3dc6dfa613872012d45e7c786 Mon Sep 17 00:00:00 2001
From: Jiffin Tony Thottan <jthottan@redhat.com>
Date: Thu, 7 Jul 2016 15:55:07 +0530
Subject: [PATCH 43/86] features/ganesha : remove ganesha xlator from client graph
The ganesha introduced in dummy xlator in the client graph, which is used
for introducing the cli options. When the volume set command "ganesha.enable"
ran, this xlator will add into client graph but never removed from it. In my
opinion there is no point in adding the ganesha xlator in the client graph
Upstream refernce :
>Change-Id: I926c4b4adf991361aa459679e275cb58246c5294
>BUG: 1349270
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
>Reviewed-on: http://review.gluster.org/14871
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Change-Id: I926c4b4adf991361aa459679e275cb58246c5294
BUG: 1348949
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/84774
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Atin Mukherjee <amukherj@redhat.com>
---
xlators/mgmt/glusterd/src/glusterd-volgen.c | 22 ----------------------
1 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index b6b4914..9e66547 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3982,28 +3982,6 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
goto out;
}
- ret = dict_get_str_boolean (set_dict, "ganesha.enable", _gf_false);
-
- if (ret == -1) {
- gf_msg (this->name, GF_LOG_WARNING, errno,
- GD_MSG_DICT_GET_FAILED, "setting ganesha.enable"
- "option failed.");
- goto out;
- }
-
- if (ret) {
- xl = volgen_graph_add (graph, "features/ganesha", volname);
-
- if (!xl) {
- gf_msg (this->name, GF_LOG_ERROR, 0,
- GD_MSG_GRAPH_FEATURE_ADD_FAIL,
- "failed to add"
- "add features/ganesha to graph");
- ret = -1;
- goto out;
- }
- }
-
/* add debug translators depending on the options */
ret = check_and_add_debug_xl (graph, set_dict, volname,
"client");
--
1.7.1