From 4bdb8f3b53da1c5535c616650ce90cd7f1e02a20 Mon Sep 17 00:00:00 2001 From: Daniel Albers Date: Fri, 31 May 2013 14:39:34 +0200 Subject: [PATCH] journal: take KeepFree into account when reporting maximum size When reporting the maximum journal size add a hint if it's limited by KeepFree. --- src/journal/journald-server.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index da5b725..6faa5d4 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -781,6 +781,8 @@ static int system_journal_open(Server *s) { sd_id128_t machine; char ids[33]; + uint64_t spaceavlb = available_space(s); + r = sd_id128_get_machine(&machine); if (r < 0) return r; @@ -821,6 +823,10 @@ static int system_journal_open(Server *s) { server_driver_message(s, SD_ID128_NULL, "Allowing system journal files to grow to %s.", format_bytes(fb, sizeof(fb), s->system_metrics.max_use)); + if (s->system_metrics.max_use > spaceavlb) + server_driver_message(s, SD_ID128_NULL, "Journal size currently limited to %s due to SystemKeepFree.", + format_bytes(fb, sizeof(fb), spaceavlb)); + } else if (r < 0) { if (r != -ENOENT && r != -EROFS) @@ -874,6 +880,10 @@ static int system_journal_open(Server *s) { server_fix_perms(s, s->runtime_journal, 0); server_driver_message(s, SD_ID128_NULL, "Allowing runtime journal files to grow to %s.", format_bytes(fb, sizeof(fb), s->runtime_metrics.max_use)); + + if (s->system_metrics.max_use > spaceavlb) + server_driver_message(s, SD_ID128_NULL, "Journal size currently limited to %s due to RuntimeKeepFree.", + format_bytes(fb, sizeof(fb), spaceavlb)); } } -- 1.8.3