|
 |
a52f674 |
From bf3a7f42544b8ca31062f032f067294d41897613 Mon Sep 17 00:00:00 2001
|
|
|
d66047d |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
d66047d |
Date: Tue, 26 Nov 2013 18:39:42 +0100
|
|
|
d66047d |
Subject: [PATCH] journal: when appending to journal file, allocate larger
|
|
|
d66047d |
blocks at once
|
|
|
d66047d |
|
|
|
d66047d |
(cherry picked from commit a676e66535e12458ea6d366a653f8dd60f982504)
|
|
|
d66047d |
|
|
|
d66047d |
Conflicts:
|
|
|
d66047d |
src/journal/journal-file.c
|
|
|
d66047d |
---
|
|
|
d66047d |
src/journal/journal-file.c | 26 +++++++++++++++++---------
|
|
|
d66047d |
1 file changed, 17 insertions(+), 9 deletions(-)
|
|
|
d66047d |
|
|
|
d66047d |
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
|
|
|
1cc3df3 |
index 425e38a990..d1b84339d0 100644
|
|
|
d66047d |
--- a/src/journal/journal-file.c
|
|
|
d66047d |
+++ b/src/journal/journal-file.c
|
|
|
d66047d |
@@ -68,6 +68,9 @@
|
|
|
d66047d |
/* How many entries to keep in the entry array chain cache at max */
|
|
|
d66047d |
#define CHAIN_CACHE_MAX 20
|
|
|
d66047d |
|
|
|
d66047d |
+/* How much to increase the journal file size at once each time we allocate something new. */
|
|
|
d66047d |
+#define FILE_SIZE_INCREASE (8ULL*1024ULL*1024ULL) /* 8MB */
|
|
|
d66047d |
+
|
|
|
d66047d |
int journal_file_set_online(JournalFile *f) {
|
|
|
d66047d |
assert(f);
|
|
|
d66047d |
|
|
|
d66047d |
@@ -218,8 +221,7 @@ static int journal_file_refresh_header(JournalFile *f) {
|
|
|
d66047d |
journal_file_set_online(f);
|
|
|
d66047d |
|
|
|
d66047d |
/* Sync the online state to disk */
|
|
|
d66047d |
- msync(f->header, PAGE_ALIGN(sizeof(Header)), MS_SYNC);
|
|
|
d66047d |
- fdatasync(f->fd);
|
|
|
d66047d |
+ fsync(f->fd);
|
|
|
d66047d |
|
|
|
d66047d |
return 0;
|
|
|
d66047d |
}
|
|
|
d66047d |
@@ -313,7 +315,7 @@ static int journal_file_verify_header(JournalFile *f) {
|
|
|
d66047d |
}
|
|
|
d66047d |
|
|
|
d66047d |
static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) {
|
|
|
d66047d |
- uint64_t old_size, new_size;
|
|
|
d66047d |
+ uint64_t old_size, new_size, file_size;
|
|
|
d66047d |
int r;
|
|
|
d66047d |
|
|
|
d66047d |
assert(f);
|
|
|
d66047d |
@@ -333,12 +335,10 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
|
|
|
d66047d |
if (new_size <= old_size)
|
|
|
d66047d |
return 0;
|
|
|
d66047d |
|
|
|
d66047d |
- if (f->metrics.max_size > 0 &&
|
|
|
d66047d |
- new_size > f->metrics.max_size)
|
|
|
d66047d |
+ if (f->metrics.max_size > 0 && new_size > f->metrics.max_size)
|
|
|
d66047d |
return -E2BIG;
|
|
|
d66047d |
|
|
|
d66047d |
- if (new_size > f->metrics.min_size &&
|
|
|
d66047d |
- f->metrics.keep_free > 0) {
|
|
|
d66047d |
+ if (new_size > f->metrics.min_size && f->metrics.keep_free > 0) {
|
|
|
d66047d |
struct statvfs svfs;
|
|
|
d66047d |
|
|
|
d66047d |
if (fstatvfs(f->fd, &svfs) >= 0) {
|
|
|
d66047d |
@@ -363,8 +363,16 @@ static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size)
|
|
|
d66047d |
if (r != 0)
|
|
|
d66047d |
return -r;
|
|
|
d66047d |
|
|
|
d66047d |
- if (fstat(f->fd, &f->last_stat) < 0)
|
|
|
d66047d |
- return -errno;
|
|
|
d66047d |
+ /* Increase the file size a bit further than this, so that we
|
|
|
d66047d |
+ * we can create larger memory maps to cache */
|
|
|
d66047d |
+ file_size = ((new_size+FILE_SIZE_INCREASE-1) / FILE_SIZE_INCREASE) * FILE_SIZE_INCREASE;
|
|
|
d66047d |
+ if (file_size > (uint64_t) f->last_stat.st_size) {
|
|
|
d66047d |
+ if (file_size > new_size)
|
|
|
d66047d |
+ ftruncate(f->fd, file_size);
|
|
|
d66047d |
+
|
|
|
d66047d |
+ if (fstat(f->fd, &f->last_stat) < 0)
|
|
|
d66047d |
+ return -errno;
|
|
|
d66047d |
+ }
|
|
|
d66047d |
|
|
|
d66047d |
f->header->arena_size = htole64(new_size - le64toh(f->header->header_size));
|
|
|
d66047d |
|