oci: partially restore comment on read-only mounts for uid/gid uses #8397
Conversation
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
Commit cab0562 removed the tryReadonlyMounts utility, in favor of mounts.ReadOnlyMounts() that was added in commit daa3a76. That change made part of the comment redundant, because mounts.ReadOnlyMounts handles both overlayfs read-only mounts (by skipping the workdir mounts), and sets the "ro" option for other mount-types, but the reason why we're using a read-only mount is still relevant, so restoring that part of the comment. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
commented
Apr 15, 2023
Comment on lines
+686
to
+689
| // Use a read-only mount when trying to get user/group information | ||
| // from the container's rootfs. Since the option does read operation | ||
| // only, we append ReadOnly mount option to prevent the Linux kernel | ||
| // from syncing whole filesystem in umount syscall. |
Member
Author
There was a problem hiding this comment.
@fuweid let me know if this is enough to restore, or if the second half (the TODO) of the original comment is still relevant in some cases;
// TODO(fuweid):
//
// Currently, it only works for overlayfs. I think we can apply it to other
// kinds of filesystem. Maybe we can return `ro` option by `snapshotter.Mount`
// API, when the caller passes that experimental annotation
// `containerd.io/snapshot/readonly.mount` something like that.
Member
Author
There was a problem hiding this comment.
Thanks! Wanted to be sure if there wasn't some case I overlooked
thaJeztah
added
cherry-pick/1.6.x
cherry-pick/1.7.x
fuweid
approved these changes
Apr 15, 2023
Comment on lines
+686
to
+689
| // Use a read-only mount when trying to get user/group information | ||
| // from the container's rootfs. Since the option does read operation | ||
| // only, we append ReadOnly mount option to prevent the Linux kernel | ||
| // from syncing whole filesystem in umount syscall. |
This was referenced Apr 17, 2023
Merged
thaJeztah
added
cherry-picked/1.6.x
dmcgowan
approved these changes
Apr 17, 2023
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.
ReadonlyMountsto make overlay mounts readonly #8259Commit cab0562 removed the tryReadonlyMounts utility, in favor of mounts.ReadOnlyMounts() that was added in commit daa3a76.
That change made part of the comment redundant, because mounts.ReadOnlyMounts handles both overlayfs read-only mounts (by skipping the workdir mounts), and sets the "ro" option for other mount-types, but the reason why we're using a read-only mount is still relevant, so restoring that part of the comment.