fix(resolve): don't add sockets to the graveyard on shutdown - #431
Open
deepin-ci-robot wants to merge 1 commit into
Conversation
Since in that case the event loop is already finished and we'd hit an assertion: [ 1295.993300] testsuite-75.sh[50]: + systemctl stop systemd-resolved.service [ 1296.005152] systemd-resolved[298]: Assertion 'e->state != SD_EVENT_FINISHED' failed at src/libsystemd/sd-event/sd-event.c:1252, function sd_event_add_io(). Aborting. Resolves: #30618 Changes: - Add debian/patches/fix-resolve-dont-add-sockets-to-graveyard-on-shutdown.patch - Modify debian/patches/series - Modify debian/changelog Upstream: systemd/systemd@ac1b7b9 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
When systemd-resolved is shutting down (e.g.
systemctl stop systemd-resolved.service), active DNS transactions are aborted and their UDP sockets were pushed to the socket graveyard. Registering a socket in the graveyard requiressd_event_add_io(), which assertse->state != SD_EVENT_FINISHED— but by that time the event loop has already finished, so resolved aborts with an assertion failure:What This PR Changes
Backport of upstream systemd commit ac1b7b9e1933c14bc7bf36d4f32a888afb3f2f4d (PR #30623): in
dns_transaction_close_connection(), skip adding sockets to the graveyard when the manager has no event loop or the event loop state isSD_EVENT_FINISHED, so shutdown-time cleanup no longer hits the assertion.Problem Solved After the Change
systemd-resolved shuts down cleanly without aborting on the
sd_event_add_io()assertion, andsystemctl stop systemd-resolved.serviceno longer crashes the daemon.Changes
Upstream
systemd/systemd@ac1b7b9
Generated-By: glm-5.3-flash
Co-Authored-By: deepin-ci-robot packages@deepin.org