summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-volume-set.c
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-04-26 10:13:21 +0200
committerVijay Bellur <vbellur@redhat.com>2015-04-26 07:35:34 -0700
commit11ecab80a0ceb5fecf2dc04c0f9806b547c51c25 (patch)
treee280d4327c7c15bd07be2f3b1140620f0696ffbb /xlators/mgmt/glusterd/src/glusterd-volume-set.c
parentbcd0cf9f156bfefa78d099d3a5eec4e489a9513d (diff)
tiering: skip CTR-xlator and config options when disabled
When compiling with --disable-tiering, GlusterD should not contain any references to the ChangeTimeRecorder xlator or any of the data tiering options. Cherry picked from commit a675ab96b917fc48fc3d7ca035590ebd7cf102bd: > 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> BUG: 1215382 Change-Id: Idb46fb80f0ca8b66115e06841d9ec15ba14c24a0 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/10378 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-volume-set.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 4c3d8518c6e..2194c429657 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -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,