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

tiering: skip CTR-xlator and config options when disabled

Browse Source 
When compiling with --disable-tiering, GlusterD should not contain any
references to the ChangeTimeRecorder xlator or any of the data tiering
options.

BUG: 1213125
Change-Id: Idb46fb80f0ca8b66115e06841d9ec15ba14c24a0
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10296
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
This commit is contained in:
Niels de Vos 2015-04-19 09:40:34 +02:00 committed by Vijay Bellur
parent 009363dbc1
commit a675ab96b9
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1599,6 +1599,7 @@ out:
return ret;
}
#if USE_GFDB /* only add changetimerecorder when GFDB is enabled */
static int
brick_graph_add_changetimerecorder (volgen_graph_t *graph,
glusterd_volinfo_t *volinfo,
@ -1665,6 +1666,7 @@ brick_graph_add_changetimerecorder (volgen_graph_t *graph,
out:
return ret;
}
#endif /* USE_GFDB */
static int
brick_graph_add_acl (volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
@ -2169,7 +2171,9 @@ static volgen_brick_xlator_t server_graph_table[] = {
{brick_graph_add_acl, "acl"},
{brick_graph_add_bitrot_stub, "bitrot-stub"},
{brick_graph_add_changelog, "changelog"},
#if USE_GFDB /* changetimerecorder depends on gfdb */
{brick_graph_add_changetimerecorder, "changetimerecorder"},
#endif
{brick_graph_add_bd, "bd"},
{brick_graph_add_trash, "trash"},
{brick_graph_add_arbiter, "arbiter"},

3
xlators/mgmt/glusterd/src/glusterd-volume-set.c
View File

@ -1692,6 +1692,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = GD_OP_VERSION_3_7_0,
},
#if USE_GFDB /* no GFDB means tiering is disabled */
/* tier translator - global tunables */
{ .key = "cluster.write-freq-threshold",
.voltype = "cluster/tier",
@ -1729,6 +1730,8 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.option = "record-counters",
.op_version = GD_OP_VERSION_3_7_0
},
#endif /* USE_GFDB */
{ .key = "locks.trace",
.voltype = "features/locks",
.type = NO_DOC,