diff options
| author | Dan Lambright <dlambrig@redhat.com> | 2015-03-24 13:59:00 -0400 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-04-06 02:35:37 -0700 |
| commit | 37bbcf6861590aa3d980846042855ee4212c89df (patch) | |
| tree | 3f6ac3e4a627b25e424ab12b789d827858e2e334 /xlators/cluster/dht/src/tier.h | |
| parent | 90f72efed8313efe0410634677f36d0fbdc5eab4 (diff) | |
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 <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/9987
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: N Balachandran <nbalacha@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/tier.h')
| -rw-r--r-- | xlators/cluster/dht/src/tier.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xlators/cluster/dht/src/tier.h b/xlators/cluster/dht/src/tier.h index 70f50bfccae..6dc830dabfa 100644 --- a/xlators/cluster/dht/src/tier.h +++ b/xlators/cluster/dht/src/tier.h @@ -27,9 +27,11 @@ #define DEFAULT_PROMOTE_FREQ_SEC 120 #define DEFAULT_DEMOTE_FREQ_SEC 120 +#define DEFAULT_WRITE_FREQ_SEC 120 +#define DEFAULT_READ_FREQ_SEC 120 /* - * Size of timer wheel. We would not promote or demote lesd + * Size of timer wheel. We would not promote or demote less * frequently than this number. */ #define TIMER_SECS 3600 @@ -38,11 +40,11 @@ #include <ctype.h> #include <sys/stat.h> -#define DEMOTION_QFILE "/var/run/gluster/demotequeryfile" -#define PROMOTION_QFILE "/var/run/gluster/promotequeryfile" +#define PROMOTION_QFILE "promotequeryfile" +#define DEMOTION_QFILE "demotequeryfile" #define GET_QFILE_PATH(is_promotion)\ - (is_promotion) ? PROMOTION_QFILE : DEMOTION_QFILE + (is_promotion) ? promotion_qfile : demotion_qfile typedef struct _query_cbk_args { xlator_t *this; |