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.

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

store: lock graphLock during Diff #1037

Merged
merged 2 commits into from
Oct 7, 2021
Merged

Conversation

giuseppe
Copy link
Member

@giuseppe giuseppe commented Oct 6, 2021

the NaiveDiff driver could cause a mount to happen without any locking
in place.

For such reason, treat the Diff operation similarly to Mount.

Closes: #1034

Alternative to #1033

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

store.go Outdated Show resolved Hide resolved
@rhatdan
Copy link
Member

rhatdan commented Oct 6, 2021

Changing locks, always scares me, could you open a PR with Podman to make sure nothing breaks.

@giuseppe
Copy link
Member Author

giuseppe commented Oct 7, 2021

opened here: containers/podman#11882

the NaiveDiff driver could cause a mount to happen without any locking
in place.

For such reason, treat the Diff operation similarly to Mount.

Closes: containers#1034

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
Copy link
Member Author

giuseppe commented Oct 7, 2021

opened here: containers/podman#11882

tests pass after reverting to store.RLock() instead of store.Lock()

@rhatdan
Copy link
Member

rhatdan commented Oct 7, 2021

@vrothberg @nalind PTAL

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

@rhatdan
Copy link
Member

rhatdan commented Oct 7, 2021

LGTM

@rhatdan rhatdan merged commit 7e016f3 into containers:main Oct 7, 2021
TomSweeneyRedHat added a commit to TomSweeneyRedHat/storage that referenced this pull request Jan 7, 2022
Backport the fix for containers#1037 to
the release-1.37 branch so that it can then be backported to Podman's
v3.4.2-rhel branch for RHEL 8.5.0.2

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
TomSweeneyRedHat added a commit to TomSweeneyRedHat/storage that referenced this pull request Jan 8, 2022
Backport the fix for containers#1037 to
the release-1.36 branch so that it can then be backported to Podman's
v3.4.2-rhel branch for RHEL 8.5.0.2

Note: containers#1097 was completed to the 1.37 branch in error.  Podman
v3.4.2-rhel is still on c/storage v1.36

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
TomSweeneyRedHat added a commit to TomSweeneyRedHat/storage that referenced this pull request Jan 9, 2022
Backport the fix for containers#1037 to
the release-1.36 branch so that it can then be backported to Podman's
v3.4.2-rhel branch for RHEL 8.5.0.2

Note: containers#1097 was completed to the 1.37 branch in error. Podman
v3.4.2-rhel is still on c/storage v1.36.  containers#1098 was submited to main
in error, hopefully the third time is the charm?

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
TomSweeneyRedHat added a commit to TomSweeneyRedHat/podman that referenced this pull request Jan 9, 2022
Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2008997 in the
v3.4.2-rhel branch.  Bumps c/storage to the version that was available
with this PR: containers/storage#1037

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
TomSweeneyRedHat added a commit to TomSweeneyRedHat/podman that referenced this pull request Jan 10, 2022
…ring llistxattr

Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=2008997 in the
v3.4.2-rhel branch. Bumps c/storage to v1.36.1 that includes this PR:
containers/storage#1037

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

error copying layers and metadata for container
4 participants