From: Franck Bui <fbui@suse.com>
Date: Fri, 2 Dec 2016 17:40:10 +0000 (+0100)
Subject: journal: make sure to initially populate the space info cache (#4807)
X-Git-Tag: v233~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3099caf2b5bb9498b1d0227c40926435ca81f26f;p=thirdparty%2Fsystemd.git

journal: make sure to initially populate the space info cache (#4807)

Make sure to populate the cache in cache_space_refresh() at least once
otherwise it's possible that the system boots fast enough (and the journal
flush service is finished) before the invalidate cache timeout (30 us) has
expired.

Fixes: #4790
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 28487a9451a..5c6941ebd61 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -144,7 +144,7 @@ static int cache_space_refresh(Server *s, JournalStorage *storage) {
 
         ts = now(CLOCK_MONOTONIC);
 
-        if (space->timestamp + RECHECK_SPACE_USEC > ts)
+        if (space->timestamp != 0 && space->timestamp + RECHECK_SPACE_USEC > ts)
                 return 0;
 
         r = determine_path_usage(s, storage->path, &vfs_used, &vfs_avail);