journal: add a test case for flushing messages out of a series of journal files into a single new one

4 files changed, 79 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index 8d0d770c00..f8f6c8ac3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,6 +123,7 @@
 /test-job-type
 /test-journal
 /test-journal-enum
+/test-journal-flush
 /test-journal-interleaving
 /test-journal-match
 /test-journal-send
diff --git a/Makefile.am b/Makefile.am
index 47c269defc..0119751c44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2961,6 +2961,12 @@ test_journal_stream_SOURCES = \
 test_journal_stream_LDADD = \
 	libsystemd-journal-core.la
 
+test_journal_flush_SOURCES = \
+	src/journal/test-journal-flush.c
+
+test_journal_flush_LDADD = \
+	libsystemd-journal-core.la
+
 test_journal_init_SOURCES = \
 	src/journal/test-journal-init.c
 
@@ -3167,6 +3173,7 @@ tests += \
 	test-journal-init \
 	test-journal-verify \
 	test-journal-interleaving \
+	test-journal-flush \
 	test-mmap-cache \
 	test-catalog
 
diff --git a/TODO b/TODO
index 653258afe0..3383f3502b 100644
--- a/TODO
+++ b/TODO
@@ -85,8 +85,6 @@ Features:
 
 * be more careful what we export on the bus as (usec_t) 0 and (usec_t) -1
 
-* increase journal files by a few MB each time, instead of piecemeal
-
 * add field to transient units that indicate whether systemd or somebody else saves/restores its settings, for integration with libvirt
 
 * systemctl: rework wait filter to not require match callback
@@ -392,9 +390,6 @@ Features:
 * service: watchdog logic: for testing purposes allow ping, but do not require pong
 
 * journal:
-  - do not use magic msync() in src/journal/journal-file.c, just call fsync()
-      <alxchk> poettering: looks like msync just calls vfs_fsync
-      http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/mm/msync.c#n18
   - import and delete pstore filesystem content at startup
   - journald: also get thread ID from client, plus thread name
   - journal: when waiting for journal additions in the client always sleep at least 1s or so, in order to minimize wakeups
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
new file mode 100644
index 0000000000..e61e87af10
--- /dev/null
+++ b/src/journal/test-journal-flush.c
@@ -0,0 +1,71 @@
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+
+/***
+  This file is part of systemd.
+
+  Copyright 2013 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as published by
+  the Free Software Foundation; either version 2.1 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include <fcntl.h>
+
+#include "sd-journal.h"
+#include "journal-file.h"
+#include "journal-internal.h"
+
+int main(int argc, char *argv[]) {
+
+        char fn[sizeof("/var/tmp/test-journal-flush-")-1 + DECIMAL_STR_MAX(pid_t) + sizeof(".journal")];
+        JournalFile *new_journal = NULL;
+        sd_journal *j = NULL;
+        unsigned n = 0;
+        int r;
+
+        sprintf(fn, "/var/tmp/test-journal-flush-%lu.journal", (unsigned long) getpid());
+
+        r = journal_file_open(fn, O_CREAT|O_RDWR, 0644, false, false, NULL, NULL, NULL, &new_journal);
+        assert_se(r >= 0);
+
+        unlink(fn);
+
+        r = sd_journal_open(&j, 0);
+        assert_se(r >= 0);
+
+        sd_journal_set_data_threshold(j, 0);
+
+        SD_JOURNAL_FOREACH(j) {
+                Object *o;
+                JournalFile *f;
+
+                f = j->current_file;
+                assert(f && f->current_offset > 0);
+
+                r = journal_file_move_to_object(f, OBJECT_ENTRY, f->current_offset, &o);
+                assert(r >= 0);
+
+                r = journal_file_copy_entry(f, new_journal, o, f->current_offset, NULL, NULL, NULL);
+                assert(r >= 0);
+
+                n++;
+                if (n > 10000)
+                        break;
+        }
+
+        sd_journal_close(j);
+
+        journal_file_close(new_journal);
+
+        return 0;
+}