Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[do not merge] debug ns file removal #4210

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

Closed
kolyshkin wants to merge 2 commits into from
Closed

[do not merge] debug ns file removal #4210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84f7703
debug ns file removal
kolyshkin Sep 18, 2020
da7dad9
DEBUG check if may_detach_mounts set on CI
kolyshkin Sep 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion internal/lib/sandbox/namespaces_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,9 @@ func (n *Namespace) Remove() error {
if err := unix.Unmount(fp, unix.MNT_DETACH); err != nil && err != unix.EINVAL {
return errors.Wrapf(err, "unable to unmount %s", fp)
}
return os.RemoveAll(fp)
out, execErr := exec.Command("sh", "-c", "grep "+filepath.Base(fp)+" /proc/*/mountinfo").CombinedOutput()
if err := os.Remove(fp); err != nil {
return errors.Wrapf(err, "can't remove ns mount file; mountinfo shows: %s (err: %v)", out, execErr)
}
return nil
}
7 changes: 6 additions & 1 deletion test/test_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#!/usr/bin/env bash
set -e

set -x
uname -a
tail /proc/sys/fs/may_detach_mounts
grep may_detach_mounts /etc/sysctl.conf /etc/sysctl.d/*
exit 0

TEST_USERNS=${TEST_USERNS:-}

Expand Down