From cfb9ea4dc68440a18b7f07422901a715b00776f0 Mon Sep 17 00:00:00 2001 From: Joseph Fernandes Date: Thu, 30 Apr 2015 16:54:16 +0530 Subject: glusterd/quota/tiering: Fixing volgen of quotad The quotad's graph generation was happening wrongly for tiered volume. The check is been inserted. Change-Id: I5554bc5280b0fbaec750e9008fdd930ad53a774f BUG: 1214219 Signed-off-by: Joseph Fernandes Reviewed-on: http://review.gluster.org/10474 Tested-by: Gluster Build System Reviewed-by: Atin Mukherjee Reviewed-by: Dan Lambright --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index a149e9916df..b6c0e4926d3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3452,9 +3452,11 @@ client_graph_builder (volgen_graph_t *graph, glusterd_volinfo_t *volinfo, goto out; if (volinfo->type == GF_CLUSTER_TYPE_TIER) - ret = volume_volgen_graph_build_clusters_tier (graph, volinfo, _gf_false); + ret = volume_volgen_graph_build_clusters_tier + (graph, volinfo, _gf_false); else - ret = volume_volgen_graph_build_clusters (graph, volinfo, _gf_false); + ret = volume_volgen_graph_build_clusters + (graph, volinfo, _gf_false); if (ret == -1) goto out; @@ -4449,8 +4451,12 @@ build_quotad_graph (volgen_graph_t *graph, dict_t *mod_dict) if (ret) goto out; - ret = volume_volgen_graph_build_clusters (&cgraph, voliter, - _gf_true); + if (voliter->type == GF_CLUSTER_TYPE_TIER) + ret = volume_volgen_graph_build_clusters_tier + (&cgraph, voliter, _gf_true); + else + ret = volume_volgen_graph_build_clusters + (&cgraph, voliter, _gf_true); if (ret) { ret = -1; goto out; -- cgit