2017-01-31 17:11:17 +00:00
|
|
|
From dc28516400f7f56a4a6fbc8ab6740d2dc98f99ea Mon Sep 17 00:00:00 2001
|
2017-01-29 22:22:41 +00:00
|
|
|
From: Franck Bui <fbui@suse.com>
|
|
|
|
|
Date: Fri, 2 Dec 2016 18:40:10 +0100
|
|
|
|
|
Subject: [PATCH] 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
|
|
|
|
|
(cherry picked from commit 3099caf2b5bb9498b1d0227c40926435ca81f26f)
|
|
|
|
|
---
|
|
|
|
|
src/journal/journald-server.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
|
|
|
|
|
index c0987625cd..1d2fce8dc7 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);
|
