[release-1.51] Fix locking for ErrLayerUnaccounted#2394
Merged
TomSweeneyRedHat merged 5 commits intoMay 8, 2026
Merged
Conversation
We already have 3 users, and we will need another one. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com> (cherry picked from commit 7cac518a00309136d7887fa059b740f3ea7c893e) Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com> (cherry picked from commit 4e5f9d59bd2ecad80367f8e0e9053940e87d2092) Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
- The graph driver contents are locked by layerStore's locking, not by the graph driver lock - Because we dropped the layer store lock, a layer might have legitimately been added in the meantime; don't treat is as unaccounted. Signed-off-by: Miloslav Trmač <mitr@redhat.com> (cherry picked from commit 8311e6c7bba621e2e32526e9c8451eb1c44e78c8) Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
I failed to push the latest version of my code in containers#720. Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com> (cherry picked from commit 0ebd8a22a08504b817148f3e86a50a8f9768fbad) Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
Collaborator
|
The failing tests probably need some variant of containers/container-libs#818 . (I didn’t check anything else yet) |
No longer built fuse-overlayfs and bats from source, we have latest versions in the CI images already. The CI broke as fuse-overlayfs was rewritten in rust we can no longer compile it like this. Signed-off-by: Paul Holzinger <pholzing@redhat.com> (cherry picked from commit c4beb460c234e34f77072b282c2bf2209eea11eb) Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
mtrmac
approved these changes
May 7, 2026
Collaborator
mtrmac
left a comment
mtrmac
left a comment
There was a problem hiding this comment.
LGTM. (Some of the refactoring is not essential, but it’s been used on main long enough that it should be safe, and minimizing manual work in backports is valuable.)
Please merge whenever appropriate.
Member
Author
|
Merging per @mtrmac, thanks! |
Member
Author
|
And booger, I forgot to add a version bump. Off to do that. |
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
3 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.
Cherry-pick the commits from containers/container-libs#720 and containers/container-libs#751 to address issues with storage not freeing up when it should
Fixes: https://redhat.atlassian.net/browse/ACCELFIX-649