systemd: backport patch to fix journal issue
PATCH 1/2 systemd: backport patch to fix journal issue
From: Chen Qi <[email protected]>
Backport a patch to fix systemd journal issue about sd_journal_next not behaving correctly after sd_journal_seek_tail.
Signed-off-by Chen Qi <[email protected]>
Signed-off-by Kai Kang <[email protected]>
--- ...journal_previous-next-return-0-at-HE.patch | 87 +++++++++++++++++++ meta/recipes-core/systemd/systemd_250.14.bb | 1 + 2 files changed, 88 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-journal-Make-sd_journal_previous-next-return-0-at-HE.patch
meta/recipes-core/systemd/systemd/0001-journal-Make-sd_journal_previous-next-return-0-at-HE.patch new file +87 -0
@@ -0,0 +1,87 @@ +From e8d0681eb49697d91f277e2f9f4cff32a30b316c Mon Sep 17 00:00:00 2001 +From: Daan De Meyer <[email protected]> +Date: Tue, 5 Jul 2022 15:22:01 +0200 +Subject: [PATCH] journal: Make sd_journal_previous/next() return 0 at + HEAD/TAIL + +Currently, both these functions don't return 0 if we're at HEAD/TAIL +and move in the corresponding direction. Let's fix that. + +Replaces #23480 + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/977ad21b5b8f6323515297bd8995dcaaca0905df] + +[Rebased for v250] +Signed-off-by: Chen Qi <[email protected]> +--- + src/journal/test-journal-interleaving.c | 4 ++++ + src/libsystemd/sd-journal/sd-journal.c | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c +index c543b87b69..f0ed1b4c74 100644 +--- a/src/journal/test-journal-interleaving.c ++++ b/src/journal/test-journal-interleaving.c +@@ -158,6 +158,7 @@ static void test_skip(void (*setup)(void)) { + */ + assert_ret(sd_journal_open_directory(&j, t, 0)); + assert_ret(sd_journal_seek_head(j)); ++ assert_ret(sd_journal_previous(j) == 0); + assert_ret(sd_journal_next(j)); + test_check_numbers_down(j, 4); + sd_journal_close(j); +@@ -166,6 +167,7 @@ static void test_skip(void (*setup)(void)) { + */ + assert_ret(sd_journal_open_directory(&j, t, 0)); + assert_ret(sd_journal_seek_tail(j)); ++ assert_ret(sd_journal_next(j) == 0); + assert_ret(sd_journal_previous(j)); + test_check_numbers_up(j, 4); + sd_journal_close(j); +@@ -174,6 +176,7 @@ static void test_skip(void (*setup)(void)) { + */ + assert_ret(sd_journal_open_directory(&j, t, 0)); + assert_ret(sd_journal_seek_tail(j)); ++ assert_ret(sd_journal_next(j) == 0); + assert_ret(r = sd_journal_previous_skip(j, 4)); + assert_se(r == 4); + test_check_numbers_down(j, 4); +@@ -183,6 +186,7 @@ static void test_skip(void (*setup)(void)) { + */ + assert_ret(sd_journal_open_directory(&j, t, 0)); + assert_ret(sd_journal_seek_head(j)); ++ assert_ret(sd_journal_previous(j) == 0); + assert_ret(r = sd_journal_next_skip(j, 4)); + assert_se(r == 4); + test_check_numbers_up(j, 4); +diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c +index 7a6cc4aca3..04cafdf1c8 100644 +--- a/src/libsystemd/sd-journal/sd-journal.c ++++ b/src/libsystemd/sd-journal/sd-journal.c +@@ -611,9 +611,9 @@ static int find_location_for_match( + /* FIXME: missing: find by monotonic */ + + if (j->current_location.type == LOCATION_HEAD) +- return journal_file_next_entry_for_data(f, dp, DIRECTION_DOWN, ret, offset); ++ return direction == DIRECTION_DOWN ? journal_file_next_entry_for_data(f, dp, DIRECTION_DOWN, ret, offset) : 0; + if (j->current_location.type == LOCATION_TAIL) +- return journal_file_next_entry_for_data(f, dp, DIRECTION_UP, ret, offset); ++ return direction == DIRECTION_UP ? journal_file_next_entry_for_data(f, dp, DIRECTION_UP, ret, offset) : 0; + if (j->current_location.seqnum_set && sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id)) + return journal_file_move_to_entry_by_seqnum_for_data(f, dp, j->current_location.seqnum, direction, ret, offset); + if (j->current_location.monotonic_set) { +@@ -704,9 +704,9 @@ static int find_location_with_matches( + /* No matches is simple */ + + if (j->current_location.type == LOCATION_HEAD) +- return journal_file_next_entry(f, 0, DIRECTION_DOWN, ret, offset); ++ return direction == DIRECTION_DOWN ? journal_file_next_entry(f, 0, DIRECTION_DOWN, ret, offset) : 0; + if (j->current_location.type == LOCATION_TAIL) +- return journal_file_next_entry(f, 0, DIRECTION_UP, ret, offset); ++ return direction == DIRECTION_UP ? journal_file_next_entry(f, 0, DIRECTION_UP, ret, offset) : 0; + if (j->current_location.seqnum_set && sd_id128_equal(j->current_location.seqnum_id, f->header->seqnum_id)) + return journal_file_move_to_entry_by_seqnum(f, j->current_location.seqnum, direction, ret, offset); + if (j->current_location.monotonic_set) { +-- +2.17.1 +
meta/recipes-core/systemd/systemd_250.14.bb +1 -0
@@ -29,6 +29,7 @@ SRC_URI += "file://touchscreen.rules \ file://0001-nspawn-make-sure-host-root-can-write-to-the-uidmappe.patch \ file://fix-vlan-qos-mapping.patch \ file://0001-core-fix-build-when-seccomp-is-off.patch \ + file://0001-journal-Make-sd_journal_previous-next-return-0-at-HE.patch \ " # patches needed by musl
Signature · 1 line
2.34.1
PATCH 2/2 systemd: systemd-journald fails to setup LogNamespace
From: Haitao Liu <[email protected]>
A LogNamespace error for systemd v250:
"""
Apr 28 17:44:00 a-rinline2b systemd[467]: [email protected]: Failed to set up special execution directory in /var/log: Not a directory Apr 28 17:44:00 a-rinline2b systemd[467]:
[email protected]: Failed at step LOGS_DIRECTORY spawning /lib/systemd/systemd-journald: Not a directory
"""
That's because that "/var/log/journal" couldn't be created during program runtime.
Signed-off-by Haitao Liu <[email protected]>
Signed-off-by Kai Kang <[email protected]>
--- ...n-in-mkdir_p-when-parent-directory-e.patch | 78 +++++++++++++++++++ meta/recipes-core/systemd/systemd_250.14.bb | 1 + 2 files changed, 79 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-basic-do-not-warn-in-mkdir_p-when-parent-directory-e.patch
meta/recipes-core/systemd/systemd/0001-basic-do-not-warn-in-mkdir_p-when-parent-directory-e.patch new file +78 -0
@@ -0,0 +1,78 @@ +From e01e68e70ae1db9fe61adec3e7bdcced7adc1930 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]> +Date: Thu, 10 Feb 2022 08:30:08 +0100 +Subject: [PATCH] basic: do not warn in mkdir_p() when parent directory exists +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This effectively disables warnings about type/mode/ownership of existing +directories when recursively creating parent directories. (Or files. If there's +a file in a place we expect a directory, the code will later try to create +a file and fail. This follows the general pattern where we do (void)mkdir() +if the mkdir() is immediately followed by opening of a file.) + +I was recently debugging an issue with the fstab-generator [1], and it says: +'Directory "/tmp" already exists, but has mode 0777 that is too permissive (0644 was requested), refusing.' +which is very specific but totally wrong in this context. +This output was added in 37c1d5e97dbc869edd8fc178427714e2d9428d2b, and I still +think it is worth to do it, because if you actually *do* want the directory, if +there's something wrong, the precise error message will make it much easier to +diagnose. And we can't easily pass the information what failed up the call chain +because there are multiple things we check (ownership, permission mask, type)… +So passing a param whether to warn or not down into the library code seems like +the best solution, despite not being very elegant. + +[1] https://bugzilla.redhat.com/show_bug.cgi?id=2051285 + +Upstream-Status: Backport [https://github.com/systemd/systemd/commit/e01e68e70ae1db9fe61adec3e7bdcced7adc1930] + +Signed-off-by: Haitao Liu <[email protected]> +Signed-off-by: Kai Kang <[email protected]> +--- + src/basic/mkdir.c | 5 ++++- + src/basic/mkdir.h | 5 +++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c +index 27144dd45a..cf7cf4a357 100644 +--- a/src/basic/mkdir.c ++++ b/src/basic/mkdir.c +@@ -55,6 +55,9 @@ int mkdir_safe_internal( + return -errno; + } + ++ if (flags & MKDIR_IGNORE_EXISTING) ++ return 0; ++ + if (!S_ISDIR(st.st_mode)) + return log_full_errno(flags & MKDIR_WARN_MODE ? LOG_WARNING : LOG_DEBUG, SYNTHETIC_ERRNO(ENOTDIR), + "Path \"%s\" already exists and is not a directory, refusing.", path); +@@ -142,7 +145,7 @@ int mkdir_parents_internal(const char *prefix, const char *path, mode_t mode, ui + s[n] = '\0'; + + if (!prefix || !path_startswith_full(prefix, path, /* accept_dot_dot= */ false)) { +- r = mkdir_safe_internal(path, mode, uid, gid, flags, _mkdirat); ++ r = mkdir_safe_internal(path, mode, uid, gid, flags | MKDIR_IGNORE_EXISTING, _mkdirat); + if (r < 0 && r != -EEXIST) + return r; + } +diff --git a/src/basic/mkdir.h b/src/basic/mkdir.h +index 34a5227577..c0c0ea6c4f 100644 +--- a/src/basic/mkdir.h ++++ b/src/basic/mkdir.h +@@ -4,8 +4,9 @@ + #include <sys/types.h> + + typedef enum MkdirFlags { +- MKDIR_FOLLOW_SYMLINK = 1 << 0, +- MKDIR_WARN_MODE = 1 << 1, ++ MKDIR_FOLLOW_SYMLINK = 1 << 0, ++ MKDIR_IGNORE_EXISTING = 1 << 1, /* Quietly accept a preexisting directory (or file) */ ++ MKDIR_WARN_MODE = 1 << 2, /* Log at LOG_WARNING when mode doesn't match */ + } MkdirFlags; + + int mkdirat_errno_wrapper(int dirfd, const char *pathname, mode_t mode); +-- +2.25.1 +
meta/recipes-core/systemd/systemd_250.14.bb +1 -0
@@ -30,6 +30,7 @@ SRC_URI += "file://touchscreen.rules \ file://fix-vlan-qos-mapping.patch \ file://0001-core-fix-build-when-seccomp-is-off.patch \ file://0001-journal-Make-sd_journal_previous-next-return-0-at-HE.patch \ + file://0001-basic-do-not-warn-in-mkdir_p-when-parent-directory-e.patch \ " # patches needed by musl
Signature · 1 line
2.34.1