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