From 37bbcf6861590aa3d980846042855ee4212c89df Mon Sep 17 00:00:00 2001 From: Dan Lambright Date: Tue, 24 Mar 2015 13:59:00 -0400 Subject: cluster/dht: fix tier.c problems found prior to feature freeze This patch resolves tiering translator issues taken from the list in bug 1203776. These issues have been selected to be fixed first. The rest will be fixed in a subsequent patch (or are not a problem). 3. Replace hardcoded #defines of promote/demote file names 6. Use loc_wipe() in migrate_using_query_file() 9. Only promote/demote files on the same node on which they reside. 14. Replace calloc with GF_CALLOC in tier.c and ensure freeing done properly. 15. Handle if parse_query_str fails 22. Only load gfdb library on server side, remove SQL references from client. Change-Id: I6563b11e58ab2e4c6b1ce44db755781ad6d930fb BUG: 1203776 Signed-off-by: Dan Lambright Reviewed-on: http://review.gluster.org/9987 Tested-by: Gluster Build System Reviewed-by: N Balachandran Reviewed-by: Niels de Vos --- xlators/cluster/dht/src/Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'xlators/cluster/dht/src/Makefile.am') diff --git a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am index bbe5cdd8d83..a8e1ec0d286 100644 --- a/xlators/cluster/dht/src/Makefile.am +++ b/xlators/cluster/dht/src/Makefile.am @@ -27,17 +27,19 @@ nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la switch_la_LDFLAGS = -module -avoid-version switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -tier_la_CFLAGS = $(AM_CFLAGS) $(SQLITE_CFLAGS) + tier_la_LDFLAGS = -module -avoid-version -tier_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\ - $(top_builddir)/libglusterfs/src/gfdb/libgfdb.la +tier_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h tier.h\ $(top_builddir)/xlators/lib/src/libxlator.h AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/libglusterfs/src/gfdb \ - -I$(top_srcdir)/xlators/lib/src + -I$(top_srcdir)/xlators/lib/src \ + -DDATADIR=\"$(localstatedir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DLIBGFDB_VERSION=\"$(LIBGFDB_VERSION)\" CLEANFILES = -- cgit