From 3db0abfbc4658d23b019d9e3ea9df56ef9dadfec Mon Sep 17 00:00:00 2001 From: Lei Feng Date: Tue, 20 Apr 2021 08:08:59 +0800 Subject: [PATCH] EX-3041 lipe: include reserved space into disk usage Typically ext4 fs reserves 5% disk space for root. It's calculated as used space when df command shows the Use%. So we calculate the usage in lpcc_purge in the same way to be consistent with df. Change-Id: I1cdee6ea66ad27bf7501cecb4a4a9495e09647a6 Signed-off-by: Lei Feng Test-Parameters: trivial Reviewed-on: https://review.whamcloud.com/43376 Tested-by: jenkins Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Andreas Dilger --- lipe/src/lpcc_purge.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lipe/src/lpcc_purge.c b/lipe/src/lpcc_purge.c index cb690af..e3946fe 100644 --- a/lipe/src/lpcc_purge.c +++ b/lipe/src/lpcc_purge.c @@ -229,6 +229,7 @@ static void lpcc_purge_usr1_handler(int sig) if (stats.s_start_time != 0) { ctime_r(&stats.s_start_time, buff); json_object_object_add(j_stats, "start_time", json_object_new_string(buff)); + json_object_object_add(j_stats, "start_usage", json_object_new_double(stats.s_start_usage)); } if (stats.s_end_time != 0) { ctime_r(&stats.s_end_time, buff); @@ -694,7 +695,7 @@ static double lpcc_purge_get_fs_usage(const char *fs) exit(1); } - usage = 100.0 * (statfs_buf.f_blocks - statfs_buf.f_bfree) / statfs_buf.f_blocks; + usage = 100.0 * (statfs_buf.f_blocks - statfs_buf.f_bavail) / statfs_buf.f_blocks; i_usage = 100.0 * (statfs_buf.f_files - statfs_buf.f_ffree) / statfs_buf.f_files; return (usage > i_usage) ? usage : i_usage; @@ -914,6 +915,8 @@ static void lpcc_purge_scan(void) policy.lp_attr_bits = LIPE_OBJECT_ATTR_ATTR; memset(&result, 0x00, sizeof(result)); + llapi_printf(LLAPI_MSG_DEBUG, "start scanning...\n"); + rc = lipe_scan(instance, &policy, &result, NULL, NULL, opt.o_scan_threads, "lpcc_purge", NULL, true, false, &ldd_err); -- 1.8.3.1