andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cluster/tier: Changed tier xattr-name value

Browse Source 
Each tier layer (for future stacking implementations)
must have a unique xattr name. We are currently using
the name of the tier subvolume excluding the volume name.

Change-Id: Id4adea61dc1c8473fb1d4d7364d1940278c6e129
BUG: 1259298
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: http://review.gluster.org/12350
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Dan Lambright <dlambrig@redhat.com>
This commit is contained in:
N Balachandran 2015-10-13 17:11:29 +05:30 committed by Dan Lambright
parent 0f31ab1ba9
commit 0243085e40
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xlators/mgmt/glusterd/src/glusterd-rebalance.c
View File

@ -287,7 +287,7 @@ glusterd_handle_defrag_start (glusterd_volinfo_t *volinfo, char *op_errstr,
if (volinfo->type == GF_CLUSTER_TYPE_TIER) {
runner_add_arg (&runner, "--xlator-option");
runner_argprintf (&runner,
"*tier-dht.xattr-name=trusted.tier-gfid");
"*tier-dht.xattr-name=trusted.tier.tier-dht");
}
runner_add_arg (&runner, "--xlator-option");

26
xlators/mgmt/glusterd/src/glusterd-volgen.c
View File

@ -3523,18 +3523,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;
@ -3614,7 +3614,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;
@ -3642,6 +3643,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;
}