Final backports for v5.6.1 #26990
Merged
Final backports for v5.6.1 #26990
Conversation
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
We already used `x` in tmpfiles, to ensure systemd did not remove our directories or clean their contents (we really need them to be left unmodified). However, systemd-tmpfiles lets us use more than one directive per line, which means we can safely add an R! (recursive remove on reboot) to these lines to ensure that, if /tmp is not a tmpfs, systemd-tmpfiles will still remove our temporary files, ensuring reboots are still accurately detected. Signed-off-by: Matt Heon <[email protected]>
The `cleanupExecBundle` function was only meant to be called on a locked container, as it does some state mutation operations. It also has a timed wait (if the directory is busy and can't be removed yet, give it a few milliseconds) in which it deliberately yields the lock to not block the container for that time. The `healthCheckExec()` function calls `cleanupExecBundle` out of a `defer` block. This is after the `defer c.lock.Unlock()` so it fires afterwards when the function returns, so we're normally fine - the container is still locked when our defer runs. The problem is that `healthCheckExec()` also unlocks the container during the expensive exec operation, and can actually fail and return while not holding the lock - meaning our `defer` can fire on an unlocked container, leading to a potential double unlock in `cleanupExecBundle`. We could, potentially, re-lock the container after the exec occurs, but we're actually waiting for a `select` to trigger to end the function, so that's not a good solution. Instead, just re-lock (if necessary) in the defer, before invoking `cleanupExecBundle()`. The `defer c.lock.Unlock()` will fire right after and unlock after us. Fixes containers#26968 Signed-off-by: Matthew Heon <[email protected]>
Signed-off-by: Tim Zhou <[email protected]>
Signed-off-by: Matt Heon <[email protected]>
openshift-ci
bot
added
release-note-none
approved
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, mheon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
|
/lgtm |
Member
|
LGTM |
Member
Author
|
Naw, I don't think it's necessary. We're quite sure it doesn't affect us. |
openshift-merge-bot
bot
merged commit 75c78eb
into
containers:v5.6
84 of 88 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Plus release notes
Does this PR introduce a user-facing change?