From af29cc47197f71b66f5a4f2dc6cca573a78bbdce Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Tue, 17 Dec 2013 16:04:46 +0530 Subject: quota: fix recording of last alert log message Backport of http://review.gluster.org/6532 PROBLEM: Alert log messages, corresponding to disk usage crossing soft-limit on a directory, weren't being logged as often as expected. CAUSE: The mechanism in place to log alert messages, once every alert-time seconds, set the previous logged time incorrectly. FIX: Update previous logged time only if we logged an alert message, ie. when the "time was right" to alert. BUG: 969461 Change-Id: Ie019c180c97d2b049fa664b14ce087b88e3b578f Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.org/6886 Reviewed-by: Raghavendra G Tested-by: Gluster Build System --- xlators/features/quota/src/quota.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index 2cac87082..5f5a8398a 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -3972,7 +3972,7 @@ off: /* Logs if * i. Usage crossed soft limit -* ii. Usage above soft limit and alert-time timed out +* ii. Usage above soft limit and alert-time elapsed */ void quota_log_usage (xlator_t *this, quota_inode_ctx_t *ctx, inode_t *inode, @@ -3980,38 +3980,45 @@ quota_log_usage (xlator_t *this, quota_inode_ctx_t *ctx, inode_t *inode, { struct timeval cur_time = {0,}; char *usage_str = NULL; + char size_str[32] = {0}; char *path = NULL; int64_t cur_size = 0; quota_priv_t *priv = NULL; priv = this->private; - cur_size = ctx->size + delta; if ((ctx->soft_lim <= 0) || (timerisset (&ctx->prev_log) && !quota_timeout (&ctx->prev_log, priv->log_timeout))) { return; } - gettimeofday (&cur_time, NULL); - ctx->prev_log = cur_time; + cur_size = ctx->size + delta; usage_str = gf_uint64_2human_readable (cur_size); + if (!usage_str) { + snprintf (size_str, sizeof (size_str), "%"PRId64, cur_size); + usage_str = (char*) size_str; + } inode_path (inode, NULL, &path); if (!path) path = uuid_utoa (inode->gfid); + gettimeofday (&cur_time, NULL); /* Usage crossed/reached soft limit */ if (DID_REACH_LIMIT (ctx->soft_lim, ctx->size, cur_size)) { gf_log (this->name, GF_LOG_ALERT, "Usage crossed " "soft limit: %s used by %s", usage_str, path); + ctx->prev_log = cur_time; } /* Usage is above soft limit */ else if (cur_size > ctx->soft_lim){ gf_log (this->name, GF_LOG_ALERT, "Usage is above " "soft limit: %s used by %s", usage_str, path); + ctx->prev_log = cur_time; } - if (usage_str) + + if (usage_str != size_str) GF_FREE (usage_str); } -- cgit