summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@fb.com>2017-05-09 10:44:41 -0700
committerJeff Darcy <jeff@pl.atyp.us>2017-05-13 15:57:12 +0000
commitdb4058ae6245bd9a6bd841541e03c080e81218af (patch)
tree9e345a6a7a7dbc264304589d0bd1f5edc2fca035
parent9d240c8bfff158291b63379e9d5fbabc48c39118 (diff)
glusterd: fix tiering/GFDB breakage
Some code that's only used for tiering was being compiled even when tiering was supposed to be disabled, and this was causing compilers to barf. Compilation is supposed to be controlled internally by USE_GFDB, ties to the "--disable-tiering" configure option. Change-Id: I41afa6ad1c50c02a9ec0f3ea420a0101d97e2960 Signed-off-by: Jeff Darcy <jdarcy@fb.com> Reviewed-on: https://review.gluster.org/17283 Tested-by: Jeff Darcy <jeff@pl.atyp.us> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kevin Vigor <kvigor@fb.com>
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index bcb8877c5bd..82513338d92 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -11,6 +11,7 @@
#include "glusterd-volgen.h"
#include "glusterd-utils.h"
+#if USE_GFDB
static int
get_tier_freq_threshold (glusterd_volinfo_t *volinfo, char *threshold_key) {
int threshold = 0;
@@ -473,6 +474,7 @@ out:
return ret;
}
+#endif
static int
validate_cache_max_min_size (glusterd_volinfo_t *volinfo, dict_t *dict,