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

cluster/tier fix bug with sql includes introduced by 12031

Browse Source 
We accidentally introduced a bug where client translators have a
dependency on sql. This broke freebsd smoke tests. Fix is to
abstract from the client those dependencies.

Change-Id: I7152573a489bacc8f32e6eb139f9ff4408288f5b
BUG: 1260730
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/12155
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
This commit is contained in:
Dan Lambright 2015-09-10 15:25:55 -04:00
parent c8b23d0135
commit c90c03e9a2
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libglusterfs/src/gfdb/gfdb_data_store.c
View File

@ -712,6 +712,12 @@ clear_files_heat (gfdb_conn_node_t *_conn_node) {
return ret;
}
static const
char *get_db_path_key()
{
return GFDB_SQL_PARAM_DBPATH;
}
void get_gfdb_methods (gfdb_methods_t *methods)
{
methods->init_db = init_db;
@ -720,4 +726,6 @@ void get_gfdb_methods (gfdb_methods_t *methods)
methods->find_recently_changed_files = find_recently_changed_files;
methods->find_unchanged_for_time_freq = find_unchanged_for_time_freq;
methods->find_recently_changed_files_freq = find_recently_changed_files_freq;
methods->get_db_path_key = get_db_path_key;
}

6
libglusterfs/src/gfdb/gfdb_data_store.h
View File

@ -236,7 +236,8 @@ typedef int (*find_recently_changed_files_freq_t) (gfdb_conn_node_t *_conn_node,
int read_freq_thresold,
gf_boolean_t _clear_counters);
typedef const
char *(*get_db_path_key_t)();
/*Libgfdb API Function: Clear the heat for all the files
*
@ -256,7 +257,10 @@ typedef struct gfdb_methods_s {
find_recently_changed_files_t find_recently_changed_files;
find_unchanged_for_time_freq_t find_unchanged_for_time_freq;
find_recently_changed_files_freq_t find_recently_changed_files_freq;
/* Do not expose dbpath directly. Expose it via an */
/* access function: get_db_path_key(). */
char *dbpath;
get_db_path_key_t get_db_path_key;
} gfdb_methods_t;
void get_gfdb_methods (gfdb_methods_t *methods);

5
xlators/cluster/dht/src/tier.c
View File

@ -470,8 +470,9 @@ tier_process_brick_cbk (brick_list_t *local_brick, void *args) {
"DB Params cannot initialized!");
goto out;
}
SET_DB_PARAM_TO_DICT(this->name, params_dict, GFDB_SQL_PARAM_DBPATH,
db_path, ret, out);
SET_DB_PARAM_TO_DICT(this->name, params_dict,
(char *) gfdb_methods.get_db_path_key(),
db_path, ret, out);
/*Get the db connection*/
conn_node = gfdb_methods.init_db((void *)params_dict, dht_tier_db_type);

1
xlators/cluster/dht/src/tier.h
View File

@ -31,7 +31,6 @@
#define TIMER_SECS 3600
#include "gfdb_data_store.h"
#include "gfdb_sqlite3.h"
#include <ctype.h>
#include <sys/stat.h>