From 11ecab80a0ceb5fecf2dc04c0f9806b547c51c25 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Sun, 26 Apr 2015 10:13:21 +0200 Subject: 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 > Reviewed-on: http://review.gluster.org/10296 > Reviewed-by: Dan Lambright > Tested-by: Gluster Build System BUG: 1215382 Change-Id: Idb46fb80f0ca8b66115e06841d9ec15ba14c24a0 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/10378 Tested-by: Gluster Build System Reviewed-by: Dan Lambright --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index ce63e4fc0a4..f38f07e0672 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -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"}, -- cgit