summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorMohammed Rafi KC <rkavunga@redhat.com>2015-05-19 14:54:32 +0530
committerKaushal M <kaushal@redhat.com>2015-05-28 07:02:37 -0700
commit05566baee6b5f0b2a3b083def4fe9bbdd0f63551 (patch)
tree2ebb4e0872074940aa12fd07708d877192feea7a /xlators/mgmt
parent3cb713f2aec3c2191cf8fd2df830b92bf3ad92d4 (diff)
tiering/nfs: duplication of nodes in client graph
When creating client volfiles, xlator tier-dht will be loaded for each volume. So for services like nfs have one or more volumes . So for each volume in the graph a tier-dht xlator will be created. So the graph parser will fail because of the redundant node in graph. By this change tier-dht will be renamed as volname-tier-dht Change-Id: I3c9b9c23ddcb853773a8a02be7fd8a5d09a7f972 BUG: 1222840 Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> Reviewed-on: http://review.gluster.org/10820 Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 969548b7600..49ba9aac559 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -555,7 +555,7 @@ glusterd_brick_op_build_payload (glusterd_op_t op, glusterd_brickinfo_t *brickin
goto out;
ret = glusterd_volinfo_find (volname, &volinfo);
if (volinfo->type == GF_CLUSTER_TYPE_TIER)
- snprintf (name, 1024, "tier-dht");
+ snprintf (name, 1024, "%s-tier-dht", volname);
else
snprintf (name, 1024, "%s-dht", volname);
brick_req->name = gf_strdup (name);
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 568ce61fb39..fc8b7699833 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3401,8 +3401,8 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph,
volinfo->type = GF_CLUSTER_TYPE_TIER;
- xl = volgen_graph_add_nolink (graph, "cluster/tier", "%s",
- "tier-dht", 0);
+ xl = volgen_graph_add_nolink (graph, "cluster/tier", "%s-%s",
+ st_volname, "tier-dht");
if (!xl)
goto out;