journal: explicitly sync namespaced journals before stopping socket uunits #32619
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
build-system
meson
please-review
|
Important An -rc1 tag has been created and a release is being prepared, so please note that PRs introducing new features and APIs will be held back until the new version has been released. |
…nits Otherwise, if a service unit that requests LogNamespace= stopped before systemd-journald@.service is started, logs generated by the service will be lost, as systemd-journald@.socket is stopped and systemd-journald@.service will never started. To prevent the issue, let's introduce another implicit dependency to a oneshot service that explicitly synchronizes a namespaced journal file when the log namespace is not needed anymore. Fixes systemd#32604.
yuwata
force-pushed
the
journal-namespace-sync
branch
from
3f9a769
to
7188935
Compare
YHNdnzj
reviewed
May 1, 2024
Comment on lines
+1316
to
+1332
| r = unit_name_build_from_type("systemd-journald", c->log_namespace, UNIT_SOCKET, &unit); | ||
| if (r < 0) | ||
| return r; | ||
|
|
||
| r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, socket_unit, true, UNIT_DEPENDENCY_FILE); | ||
| r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, unit, true, UNIT_DEPENDENCY_FILE); | ||
| if (r < 0) | ||
| return r; | ||
|
|
||
| r = unit_name_build_from_type("systemd-journald-varlink", c->log_namespace, UNIT_SOCKET, &varlink_socket_unit); | ||
| unit = mfree(unit); | ||
|
|
||
| r = unit_name_build_from_type("systemd-journald-varlink", c->log_namespace, UNIT_SOCKET, &unit); | ||
| if (r < 0) | ||
| return r; | ||
|
|
||
| r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, unit, true, UNIT_DEPENDENCY_FILE); | ||
| if (r < 0) | ||
| return r; |
There was a problem hiding this comment.
FOREACH_STRING can be used for these two
There was a problem hiding this comment.
this fixes tests so let's get it merged and fixup later if needed
|
This approach seems to fix it for me. It took 5 tries of running TEST-44-LOG-NAMESPACE under heavy load for the bug to happen before cherry-picking this commit, and then it ran for an hour without problems afterwards so I'm fairly confident this works. |
bluca
approved these changes
May 2, 2024
github-actions
bot
removed
the
please-review
g7
pushed a commit
to droidian/systemd
that referenced
this pull request
May 14, 2024
Required for systemd/systemd#32619 Gbp-Dch: ignore
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Otherwise, if a service unit that requests LogNamespace= stopped before systemd-journald@.service is started, logs generated by the service will be lost, as systemd-journald@.socket is stopped and
systemd-journald@.service will never started.
To prevent the issue, let's introduce another implicit dependency to a oneshot service that explicitly synchronizes a namespaced journal file when the log namespace is not needed anymore.
Fixes #32604.