Merge pull request #1790 from isimluk/beware-of-goroutine-locals

Do not hide errors when creating container with UserNSRoot
This commit is contained in:
OpenShift Merge Robot
2018-11-08 14:06:02 -08:00
committed by GitHub

View File

@ -74,7 +74,8 @@ func (r *OCIRuntime) createContainer(ctr *Container, cgroupParent string, restor
defer wg.Done()
runtime.LockOSThread()
fd, err := os.Open(fmt.Sprintf("/proc/%d/task/%d/ns/mnt", os.Getpid(), unix.Gettid()))
var fd *os.File
fd, err = os.Open(fmt.Sprintf("/proc/%d/task/%d/ns/mnt", os.Getpid(), unix.Gettid()))
if err != nil {
return
}