SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29235 from yuwata/sd-journal-reset-saved-direction-on-seek

Browse Source 
sd-journal: reset saved direction on seek
This commit is contained in:
Luca Boccassi
2023-09-20 22:06:01 +01:00
committed by GitHub
parent 7c52d5236a 4aa33df845
commit 2cb170376a
3 changed files with 73 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/test-journal-interleaving.c
+66 -60
View File
@@ -173,126 +173,132 @@ static void test_skip_one(void (*setup)(void)) {
/* Seek to head, iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_ret(sd_journal_next(j)); /* pointing the first entry */
assert_se(sd_journal_next(j) == 1); /* pointing to the first entry */
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to head, iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_ret(sd_journal_next(j)); /* pointing the first entry */
assert_ret(sd_journal_previous(j)); /* no-op */
assert_se(sd_journal_next(j) == 1); /* pointing to the first entry */
assert_se(sd_journal_previous(j) == 0); /* no-op */
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to head twice, iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_se(sd_journal_next(j) == 1); /* pointing to the first entry */
assert_ret(sd_journal_seek_head(j));
assert_se(sd_journal_next(j) == 1); /* pointing to the first entry */
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to head, move to previous, then iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(sd_journal_next(j)); /* pointing the first entry */
assert_se(sd_journal_previous(j) == 0); /* no-op */
assert_se(sd_journal_next(j) == 1); /* pointing to the first entry */
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to head, walk several steps, then iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(sd_journal_next(j)); /* pointing the first entry */
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(sd_journal_previous(j)); /* no-op */
assert_se(sd_journal_previous(j) == 0); /* no-op */
assert_se(sd_journal_previous(j) == 0); /* no-op */
assert_se(sd_journal_previous(j) == 0); /* no-op */
assert_se(sd_journal_next(j) == 1); /* pointing to the first entry */
assert_se(sd_journal_previous(j) == 0); /* no-op */
assert_se(sd_journal_previous(j) == 0); /* no-op */
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to tail, iterate up. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_tail(j));
assert_ret(sd_journal_previous(j));
assert_se(sd_journal_previous(j) == 1); /* pointing to the last entry */
test_check_numbers_up(j, 9);
sd_journal_close(j);
/* Seek to tail twice, iterate up. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_tail(j));
assert_se(sd_journal_previous(j) == 1); /* pointing to the last entry */
assert_ret(sd_journal_seek_tail(j));
assert_se(sd_journal_previous(j) == 1); /* pointing to the last entry */
test_check_numbers_up(j, 9);
sd_journal_close(j);
/* Seek to tail, move to next, then iterate up. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_tail(j));
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(sd_journal_previous(j)); /* pointing the first entry */
assert_se(sd_journal_next(j) == 0); /* no-op */
assert_se(sd_journal_previous(j) == 1); /* pointing to the last entry */
test_check_numbers_up(j, 9);
sd_journal_close(j);
/* Seek to tail, walk several steps, then iterate up. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_tail(j));
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(sd_journal_previous(j)); /* pointing the last entry. */
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(sd_journal_next(j)); /* no-op */
assert_se(sd_journal_next(j) == 0); /* no-op */
assert_se(sd_journal_next(j) == 0); /* no-op */
assert_se(sd_journal_next(j) == 0); /* no-op */
assert_se(sd_journal_previous(j) == 1); /* pointing to the last entry. */
assert_se(sd_journal_next(j) == 0); /* no-op */
assert_se(sd_journal_next(j) == 0); /* no-op */
test_check_numbers_up(j, 9);
sd_journal_close(j);
/* Seek to tail, skip to head, iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_tail(j));
assert_ret(r = sd_journal_previous_skip(j, 9));
assert_se(r == 9);
assert_se(sd_journal_previous_skip(j, 9) == 9); /* pointing to the first entry. */
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to tail, skip to head in a more complex way, then iterate down. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_tail(j));
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(r = sd_journal_previous_skip(j, 4));
assert_se(r == 4);
assert_ret(r = sd_journal_previous_skip(j, 5));
assert_se(r == 5);
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(r = sd_journal_previous_skip(j, 5));
assert_se(r == 0);
assert_ret(sd_journal_next(j));
assert_ret(r = sd_journal_previous_skip(j, 5));
assert_se(r == 1);
assert_ret(sd_journal_next(j));
assert_ret(sd_journal_next(j));
assert_ret(sd_journal_previous(j));
assert_ret(sd_journal_next(j));
assert_ret(sd_journal_next(j));
assert_ret(r = sd_journal_previous_skip(j, 5));
assert_se(r == 3);
assert_se(sd_journal_next(j) == 0);
assert_se(sd_journal_previous_skip(j, 4) == 4);
assert_se(sd_journal_previous_skip(j, 5) == 5);
assert_se(sd_journal_previous(j) == 0);
assert_se(sd_journal_previous_skip(j, 5) == 0);
assert_se(sd_journal_next(j) == 1);
assert_se(sd_journal_previous_skip(j, 5) == 1);
assert_se(sd_journal_next(j) == 1);
assert_se(sd_journal_next(j) == 1);
assert_se(sd_journal_previous(j) == 1);
assert_se(sd_journal_next(j) == 1);
assert_se(sd_journal_next(j) == 1);
assert_se(sd_journal_previous_skip(j, 5) == 3);
test_check_numbers_down(j, 9);
sd_journal_close(j);
/* Seek to head, skip to tail, iterate up. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_ret(r = sd_journal_next_skip(j, 9));
assert_se(r == 9);
assert_se(sd_journal_next_skip(j, 9) == 9);
test_check_numbers_up(j, 9);
sd_journal_close(j);
/* Seek to head, skip to tail in a more complex way, then iterate up. */
assert_ret(sd_journal_open_directory(&j, t, 0));
assert_ret(sd_journal_seek_head(j));
assert_ret(sd_journal_previous(j)); /* no-op */
assert_ret(r = sd_journal_next_skip(j, 4));
assert_se(r == 4);
assert_ret(r = sd_journal_next_skip(j, 5));
assert_se(r == 5);
assert_ret(sd_journal_next(j)); /* no-op */
assert_ret(r = sd_journal_next_skip(j, 5));
assert_se(r == 0);
assert_ret(sd_journal_previous(j));
assert_ret(r = sd_journal_next_skip(j, 5));
assert_se(r == 1);
assert_ret(sd_journal_previous(j));
assert_ret(sd_journal_previous(j));
assert_ret(sd_journal_next(j));
assert_ret(sd_journal_previous(j));
assert_ret(sd_journal_previous(j));
assert_ret(r = sd_journal_next_skip(j, 5));
assert_se(r == 3);
assert_se(sd_journal_previous(j) == 0);
assert_se(sd_journal_next_skip(j, 4) == 4);
assert_se(sd_journal_next_skip(j, 5) == 5);
assert_se(sd_journal_next(j) == 0);
assert_se(sd_journal_next_skip(j, 5) == 0);
assert_se(sd_journal_previous(j) == 1);
assert_se(sd_journal_next_skip(j, 5) == 1);
assert_se(sd_journal_previous(j) == 1);
assert_se(sd_journal_previous(j) == 1);
assert_se(sd_journal_next(j) == 1);
assert_se(sd_journal_previous(j) == 1);
assert_se(sd_journal_previous(j) == 1);
assert_se(r = sd_journal_next_skip(j, 5) == 3);
test_check_numbers_up(j, 9);
sd_journal_close(j);
src/libsystemd/sd-journal/journal-file.c
+5
View File
@@ -3343,6 +3343,10 @@ void journal_file_reset_location(JournalFile *f) {
f->current_monotonic = 0;
zero(f->current_boot_id);
f->current_xor_hash = 0;
/* Also reset the previous reading direction. Otherwise, next_beyond_location() may wrongly handle we
* already hit EOF. See issue #29216. */
f->last_direction = _DIRECTION_INVALID;
}
void journal_file_save_location(JournalFile *f, Object *o, uint64_t offset) {
@@ -3939,6 +3943,7 @@ int journal_file_open(
MAX(MIN_COMPRESS_THRESHOLD, compress_threshold_bytes),
.strict_order = FLAGS_SET(file_flags, JOURNAL_STRICT_ORDER),
.newest_boot_id_prioq_idx = PRIOQ_IDX_NULL,
.last_direction = _DIRECTION_INVALID,
};
if (fname) {
src/libsystemd/sd-journal/journal-file.h
+2 -1
View File
@@ -31,7 +31,8 @@ typedef struct JournalMetrics {
typedef enum direction {
DIRECTION_UP,
DIRECTION_DOWN
DIRECTION_DOWN,
_DIRECTION_INVALID = -EINVAL,
} direction_t;
typedef enum LocationType {