Fix locking bugs from #1916, and one more#1927
Merged
openshift-merge-bot[bot] merged 4 commits intocontainers:mainfrom May 22, 2024
Merged
Fix locking bugs from #1916, and one more#1927openshift-merge-bot[bot] merged 4 commits intocontainers:mainfrom
openshift-merge-bot[bot] merged 4 commits intocontainers:mainfrom
Conversation
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mtrmac The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
|
LGTM, just a nit, should "Fix the documentation of store.putLayer" and "Move the containerStore locking inside putLayer" be squashed since the latter changes the comment added by the former? |
Should not change behavior. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
There's no need for the callers to deal with this, and now the API of the function is much less surprising. Also fix the documentation about locking rlstores. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
As documented at the top of the store type, the roLayerStores must be locked _before_ the container store. This is a minimal / conservative fix; this probably could use a read-only lock only for the duration of the "LayerID == parent" check. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
b24555d to
830c7c6
Compare
Collaborator
Author
|
Thanks! You’re right that future maintainers won’t care that the changes originally happened for unrelated reasons, and a simpler history helps. Squashed. |
Member
|
/lgtm |
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.
… and add some comments.
See individual commit messages for details.
Cc: @giuseppe