diff options
Diffstat (limited to 'xlators/cluster/dht/src/dht-diskusage.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-diskusage.c | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/xlators/cluster/dht/src/dht-diskusage.c b/xlators/cluster/dht/src/dht-diskusage.c index 13eaabae1c1..c0588828fdb 100644 --- a/xlators/cluster/dht/src/dht-diskusage.c +++ b/xlators/cluster/dht/src/dht-diskusage.c @@ -10,14 +10,10 @@ /* TODO: add NS locking */ -#include "glusterfs.h" -#include "xlator.h" #include "dht-common.h" -#include "dht-messages.h" -#include "defaults.h" #include <sys/time.h> -#include "events.h" +#include <glusterfs/events.h> int dht_du_info_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, @@ -155,22 +151,18 @@ dht_get_du_info(call_frame_t *frame, xlator_t *this, loc_t *loc) dht_conf_t *conf = NULL; call_frame_t *statfs_frame = NULL; dht_local_t *statfs_local = NULL; - struct timeval tv = { - 0, - }; loc_t tmp_loc = { 0, }; + time_t now; conf = this->private; - - gettimeofday(&tv, NULL); - + now = gf_time(); /* make it root gfid, should be enough to get the proper info back */ tmp_loc.gfid[15] = 1; - if (tv.tv_sec > (conf->refresh_interval + conf->last_stat_fetch.tv_sec)) { + if (now > (conf->refresh_interval + conf->last_stat_fetch)) { statfs_frame = copy_frame(frame); if (!statfs_frame) { goto err; @@ -202,7 +194,7 @@ dht_get_du_info(call_frame_t *frame, xlator_t *this, loc_t *loc) statfs_local->params); } - conf->last_stat_fetch.tv_sec = tv.tv_sec; + conf->last_stat_fetch = now; } return 0; err: @@ -260,7 +252,7 @@ dht_is_subvol_filled(xlator_t *this, xlator_t *subvol) "full (%.2f %%), consider adding more bricks", subvol->name, usage); - strncpy(vol_name, this->name, sizeof(vol_name)); + (void)snprintf(vol_name, sizeof(vol_name), "%s", this->name); vol_name[(strlen(this->name) - 4)] = '\0'; gf_event(EVENT_DHT_DISK_USAGE, "volume=%s;subvol=%s;usage=%.2f %%", @@ -276,7 +268,7 @@ dht_is_subvol_filled(xlator_t *this, xlator_t *subvol) "(%.2f %%), consider adding more bricks", subvol->name, usage); - strncpy(vol_name, this->name, sizeof(vol_name)); + (void)snprintf(vol_name, sizeof(vol_name), "%s", this->name); vol_name[(strlen(this->name) - 4)] = '\0'; gf_event(EVENT_DHT_INODES_USAGE, |