Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[v5.16 Backport] storage: use race-free AddNames instead of SetNames #1502

Closed
wants to merge 4 commits into from
Closed

[v5.16 Backport] storage: use race-free AddNames instead of SetNames #1502

wants to merge 4 commits into from

Conversation

flouthoc
Copy link
Contributor

Backport of: #1480

Commits from parallel builds using SetNames removes names from
storage for other builds.

Use race-free atomic AddNames to prevent breaking of parallel builds.

flouthoc added 4 commits March 23, 2022 17:14
@flouthoc
vendor: bump c/storage to flouthoc/storage v1.36.1-0.20220323105516-d…
493dcb6 
…d126860cd51

Signed-off-by: Aditya R <[email protected]>
@flouthoc
storage: use race-free AddNames instead of SetNames
9a03d55 
Commits from parallel builds using `SetNames` removes `names` from
storage for other builds.

Use race-free atomic `AddNames` to prevent breaking of parallel builds.

Signed-off-by: Aditya R <[email protected]>
@flouthoc
version: bump to v5.16.3
5a8e266 
Signed-off-by: Aditya R <[email protected]>
@flouthoc
version: bump to v5.16.3-dev
9e088eb 
Signed-off-by: Aditya R <[email protected]>
@flouthoc
Copy link
Contributor Author

Wait for a release from: containers/storage#1173

@flouthoc
Copy link
Contributor Author

@containers/image-maintainers PTAL. I still have to wait for c/storage backport to get merged and released before this PR can be merged.

@flouthoc
Copy link
Contributor Author

@TomSweeneyRedHat FYI

@flouthoc
Copy link
Contributor Author

@mtrmac @vrothberg Could you please create a release-5.19 branch so i could get this patch there, as it is needed by podman v4.0-rhel branch https://github.com/containers/podman/blob/v4.0-rhel/go.mod#L17

@mtrmac
Copy link
Collaborator

mtrmac commented Mar 23, 2022

@mtrmac @vrothberg Could you please create a release-5.19 branch

Done.

mtrmac
mtrmac reviewed Mar 23, 2022
View reviewed changes
Copy link
Collaborator

@mtrmac mtrmac left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK to the code (but blocked on a c/storage release).

WRT the test failures, is it possible to fix that by updating SKOPEO_BRANCH on this branch to an appropriate consumer of c/image 5.16?

@flouthoc
Copy link
Contributor Author

@mtrmac I am marking this as draft since this PR might not be needed as @TomSweeneyRedHat confirmed that we are only backporting to v4.0-rhel and not to v3.4.2-rhel.

So marking this PR as draft and will open a replacement on release-5.19.

@flouthoc flouthoc marked this pull request as draft March 23, 2022 17:12
@flouthoc
Copy link
Contributor Author

Raised a replacement PR here: #1503

@TomSweeneyRedHat
Copy link
Member

@flouthoc I'm going to close this for now. However, we may resurrect it if we have to backport later.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mtrmac mtrmac mtrmac left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@flouthoc @mtrmac @TomSweeneyRedHat