Make argument validation of mount.UnmountRecursive compatible to mount.UnmountAll#8035
Merged
estesp merged 1 commit intocontainerd:mainfrom Feb 2, 2023
Merged
Make argument validation of mount.UnmountRecursive compatible to mount.UnmountAll#8035estesp merged 1 commit intocontainerd:mainfrom
mount.UnmountRecursive compatible to mount.UnmountAll#8035estesp merged 1 commit intocontainerd:mainfrom
Conversation
Signed-off-by: Kohei Tokunaga <[email protected]>
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.
This commit fixes the cleanup failure of containers with custom location of rootfs.
Recently
mount.UnmountAllinvocations have been relaced bymount.UnmountRecursive. When""(empty path) is passed tomount.UnmountAll, it simply ignores that path and returns immediately without error. However,mount.UnmountRecursiveaccepts such argument and try to perform unmounting on the root directory. Containers with custom rootfs location cause invocations ofmount.UnmountRecursivewith"".containerd/pkg/process/init.go
Line 310 in e307f87
It results in cleanup failure of containers and unmounting of mountpoints under
"/"(if shim process has privilege). This commit tries to fix this issue by fixingmount.UnmountRecursiveto return immediately when""(empty path) is passed. IIUC this is the same behaviour withmount.UnmountAll.Reproducer:
NOTE: the following can result in unmounting of mountpoints on the host so should run in the sandboxed environemnt.
Then it hangs after "hello" is printed and mountpoints under
"/"will be unmounted.