From e9807b8e5799cd5f62fcaa1f228bb470f4bc1157 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Tue, 30 Jun 2015 11:15:54 +0530 Subject: tiering/quota: failed to match subvolume quota daemon choose subvolume for a volume using volume-id specified in graph. For that it expect a subvolume (DHT) to be named as volume-id. But tiering translator comes above dht, so it failed to match the correct subvolume. Change-Id: I63d4b63cd8fb2806bc7b2b2f100dbef62202e6da BUG: 1236128 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/11431 Reviewed-by: Joseph Fernandes Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Dan Lambright Tested-by: Dan Lambright --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 0164cbe1de8..710407d2159 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -3474,9 +3474,14 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph, hxl = first_of(graph); volinfo->type = GF_CLUSTER_TYPE_TIER; + if (!is_quotad) { - xl = volgen_graph_add_nolink (graph, "cluster/tier", "%s-%s", - st_volname, "tier-dht"); + xl = volgen_graph_add_nolink (graph, "cluster/tier", "%s-%s", + st_volname, "tier-dht"); + } else { + xl = volgen_graph_add_nolink (graph, "cluster/tier", "%s", + st_volname); + } if (!xl) goto out; -- cgit