fix(sd-journal): check sd-event state before setting up post change timer - #428
Open
deepin-ci-robot wants to merge 1 commit into
Conversation
…imer The similar check already exists in schedule_post_change(). The function is currently called at two places. - journal_file_open() in sd-journal: In this case, if the timer is not set up, then journal_file_post_change() will be called at the end of journal_file_append_entry(). So, the necessary task will be done sequentially when an journal entry is stored to the opened journal file. That is desired when the function is called at outside of the event loop. - server_open_journal() in journald: This is not called after we exit the event loop. So, we can safely do nothing in the function if the event loop is being finished or already finished. Fixes #30644. Changes: - Add debian/patches/fix-sd-journal-check-sd-event-state-before-post-change-timer.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd@5b201ff Generated-By: glm-5.3-flash Co-Authored-By: deepin-ci-robot <packages@deepin.org>
Contributor
Author
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
TAG Bot TAG: 255.2-4deepin68 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Problem Before the Change
journal_file_enable_post_change_timer()unconditionally installs an sd-event timer, even when the event loop is already exiting (SD_EVENT_EXITING) or has finished (SD_EVENT_FINISHED). Setting up a timer on a dying event loop leaves the journal change posting in a broken state (see upstream issue #30644).What This PR Changes
Backports upstream systemd commit 5b201ffb1e72 ("sd-journal: check sd-event state before setting up post change timer"):
journal_file_enable_post_change_timer()now checkssd_event_get_state()first and safely does nothing (returns 0) when the event loop isEXITINGorFINISHED; the caller then posts the change explicitly viajournal_file_post_change()at the end ofjournal_file_append_entry().0to1to distinguish "timer registered" from "timer not registered", mirroring the existing check inschedule_post_change().Problem Solved After the Change
When journald shuts down, the post-change timer is no longer installed on a finished event loop; the pending journal file change is posted synchronously instead, avoiding the race reported in upstream issue #30644.
Changes
Upstream
systemd/systemd@5b201ff
Upstream PR: systemd/systemd#30654
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot packages@deepin.org