vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add context to net ns symlink removal errors

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2018-02-25 20:16:00 -08:00
parent 8ea79e755f
commit f94948d8ec
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/sandbox/sandbox.go
View file

@ -59,10 +59,14 @@ func (ns *NetNs) symlinkCreate(name string) error {
func (ns *NetNs) symlinkRemove() error { func (ns *NetNs) symlinkRemove() error {
if err := ns.symlink.Close(); err != nil { if err := ns.symlink.Close(); err != nil {
return err return fmt.Errorf("failed to close net ns symlink: %v", err)
} }
return os.RemoveAll(ns.symlink.Name()) if err := os.RemoveAll(ns.symlink.Name()); err != nil {
return fmt.Errorf("failed to remove net ns symlink: %v", err)
}
return nil
} }
func isSymbolicLink(path string) (bool, error) { func isSymbolicLink(path string) (bool, error) {