clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-10-04 07:48:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: take KeepFree into account when reporting maximum size

Browse Source 
When reporting the maximum journal size add a hint if it's limited
by KeepFree.
This commit is contained in:
Daniel Albers
2013-06-01 09:15:11 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 1a2a4cf250
commit fe1abefcd3
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journald-server.c
+11
View File
@@ -780,6 +780,9 @@ static int system_journal_open(Server *s) {
char *fn;
sd_id128_t machine;
char ids[33];
uint64_t avail;
avail = available_space(s);
r = sd_id128_get_machine(&machine);
if (r < 0)
@@ -821,6 +824,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 > avail)
server_driver_message(s, SD_ID128_NULL, "Journal size currently limited to %s due to SystemKeepFree.",
format_bytes(fb, sizeof(fb), avail));
} else if (r < 0) {
if (r != -ENOENT && r != -EROFS)
@@ -874,6 +881,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 > avail)
server_driver_message(s, SD_ID128_NULL, "Journal size currently limited to %s due to RuntimeKeepFree.",
format_bytes(fb, sizeof(fb), avail));
}
}