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

[v1.24 backport] bump to race-free c/image and c/storage #3850

Merged
merged 3 commits into from Mar 25, 2022
Merged

[v1.24 backport] bump to race-free c/image and c/storage #3850

merged 3 commits into from Mar 25, 2022

Conversation

flouthoc
Copy link
Collaborator

Commits explained in bullet points.

New Names API in c/storage and c/image ensures that Name modification operations are race-free.

  • Adds a test to verify parallel/concurrent builds via podman don't race against each other.

For reference actual upstream PR: containers/image#1480 and containers/storage#1153

@flouthoc
vendor: bump c/storage to v1.38.3
586da3a 
Bump c/storage to v1.38.3 so podman could use new `race-free`
`AddNames` and `RemoveNames` api

Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
vendor: bump c/image to v5.19.2
ab8c884 
Bump c/image to upstream v5.19.2 so podman could use new race-free
code.

Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
Copy link
Collaborator Author

@jnovy @TomSweeneyRedHat @rhatdan PTAL. @jnovy Is merging into this branch enough without any release ?

@jnovy
Copy link

jnovy commented Mar 24, 2022

Yes @flouthoc I will cherry-pick it from this branch once merged.

@TomSweeneyRedHat
Copy link
Member

Tests failing, could you also bump c/common to 0.47.5?

@flouthoc
Copy link
Collaborator Author

@TomSweeneyRedHat Looks like flake to me. I have restarted tests, if they still fail. I'll bump c/common.

@flouthoc
vendor: bump c/common to 0.47.5
7a2cea8 
Signed-off-by: Aditya R <arajan@redhat.com>
@flouthoc
Copy link
Collaborator Author

@TomSweeneyRedHat bumped c/common to 0.47.5 as well however its unrelated to this PR. Tests should pass previous fails were flakes.

@TomSweeneyRedHat
Copy link
Member

LGTM

@TomSweeneyRedHat
Copy link
Member

Partially addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2066519 RHEL 8.6 BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2055487

@rhatdan @nalind @vrothberg PTAL and if LGTY, then merge away.

giuseppe
giuseppe approved these changes Mar 25, 2022
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Mar 25, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 25, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, giuseppe

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 208827e into containers:release-1.24 Mar 25, 2022
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@giuseppe giuseppe giuseppe approved these changes

@nalind nalind Awaiting requested review from nalind

@rhatdan rhatdan Awaiting requested review from rhatdan

@TomSweeneyRedHat TomSweeneyRedHat Awaiting requested review from TomSweeneyRedHat

Assignees

@giuseppe giuseppe

Labels
approved lgtm locked - please file new issue/PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@flouthoc @jnovy @TomSweeneyRedHat @giuseppe @openshift-merge-robot