summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volgen.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index bf55d52f440..a497129497f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
@@ -3528,18 +3528,18 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph,
glusterd_volinfo_t *volinfo,
gf_boolean_t is_quotad)
{
- int ret = -1;
- xlator_t *root;
+ int ret = -1;
+ xlator_t *root = NULL;
xlator_t *xl, *hxl, *cxl;
- glusterd_brickinfo_t *brick = NULL;
- char *rule;
- int st_brick_count = 0;
- int st_replica_count = 0;
- int st_disperse_count = 0;
- int st_dist_leaf_count = 0;
- int st_type = 0;
- int dist_count = 0;
- int start_count = 0;
+ glusterd_brickinfo_t *brick = NULL;
+ char *rule = NULL;
+ int st_brick_count = 0;
+ int st_replica_count = 0;
+ int st_disperse_count = 0;
+ int st_dist_leaf_count = 0;
+ int st_type = 0;
+ int dist_count = 0;
+ int start_count = 0;
char *decommissioned_children = NULL;
st_brick_count = volinfo->brick_count;
@@ -3619,7 +3619,8 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph,
if (ret)
goto out;
- ret = xlator_set_option(xl, "xattr-name", "trusted.tier-gfid");
+ /*Each dht/tier layer must have a different xattr name*/
+ ret = xlator_set_option(xl, "xattr-name", "trusted.tier.tier-dht");
if (ret)
goto out;
@@ -3647,6 +3648,7 @@ volume_volgen_graph_build_clusters_tier (volgen_graph_t *graph,
volinfo->dist_leaf_count = st_dist_leaf_count;
volinfo->tier_info.cur_tier_hot = 0;
+ GF_FREE (rule);
return ret;
}