c272c49555
/proc/self/ns/net gives the main thread's namespace, not necessarily
the namespace of the thread that's running the testcases. This causes
sporadic failures of the tests.
For example, with a testcase reading inodes after switching netns:
/proc/27686/task/27689/ns/net 4026532565
/proc/self/ns/net 4026531969
/proc/27686/task/27689/ns/net 4026532565
See also:
008d17ae00
Running Suite: pkg/ns Suite
===========================
Random Seed: 1459953577
Will run 6 of 6 specs
• Failure [0.028 seconds]
Linux namespace operations
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:167
WithNetNS
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:166
executes the callback within the target network namespace [It]
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:97
Expected
<uint64>: 4026531969
to equal
<uint64>: 4026532565
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:96
------------------------------
•••••
Summarizing 1 Failure:
[Fail] Linux namespace operations WithNetNS [It] executes the callback within the target network namespace
/cni/gopath/src/github.com/appc/cni/pkg/ns/ns_test.go:96
Ran 6 of 6 Specs in 0.564 seconds
FAIL! -- 5 Passed | 1 Failed | 0 Pending | 0 Skipped --- FAIL: TestNs (0.56s)
FAIL
110 lines
2.8 KiB
Go
110 lines
2.8 KiB
Go
// Copyright 2016 CNI authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
// Package testhelpers provides common support behavior for tests
|
|
package testhelpers
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"runtime"
|
|
"sync"
|
|
|
|
"golang.org/x/sys/unix"
|
|
|
|
. "github.com/onsi/ginkgo"
|
|
. "github.com/onsi/gomega"
|
|
)
|
|
|
|
func getCurrentThreadNetNSPath() string {
|
|
pid := unix.Getpid()
|
|
tid := unix.Gettid()
|
|
return fmt.Sprintf("/proc/%d/task/%d/ns/net", pid, tid)
|
|
}
|
|
|
|
func GetInodeCurNetNS() (uint64, error) {
|
|
return GetInode(getCurrentThreadNetNSPath())
|
|
}
|
|
|
|
func GetInode(path string) (uint64, error) {
|
|
file, err := os.Open(path)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
defer file.Close()
|
|
return GetInodeF(file)
|
|
}
|
|
|
|
func GetInodeF(file *os.File) (uint64, error) {
|
|
stat := &unix.Stat_t{}
|
|
err := unix.Fstat(int(file.Fd()), stat)
|
|
return stat.Ino, err
|
|
}
|
|
|
|
func MakeNetworkNS(containerID string) string {
|
|
namespace := "/var/run/netns/" + containerID
|
|
|
|
err := os.MkdirAll("/var/run/netns", 0600)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
// create an empty file at the mount point
|
|
mountPointFd, err := os.Create(namespace)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
mountPointFd.Close()
|
|
|
|
var wg sync.WaitGroup
|
|
wg.Add(1)
|
|
|
|
// do namespace work in a dedicated goroutine, so that we can safely
|
|
// Lock/Unlock OSThread without upsetting the lock/unlock state of
|
|
// the caller of this function
|
|
go (func() {
|
|
defer wg.Done()
|
|
|
|
runtime.LockOSThread()
|
|
defer runtime.UnlockOSThread()
|
|
|
|
defer GinkgoRecover()
|
|
|
|
// capture current thread's original netns
|
|
currentThreadNetNSPath := getCurrentThreadNetNSPath()
|
|
originalNetNS, err := unix.Open(currentThreadNetNSPath, unix.O_RDONLY, 0)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
defer unix.Close(originalNetNS)
|
|
|
|
// create a new netns on the current thread
|
|
err = unix.Unshare(unix.CLONE_NEWNET)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
// bind mount the new netns from the current thread onto the mount point
|
|
err = unix.Mount(currentThreadNetNSPath, namespace, "none", unix.MS_BIND, "")
|
|
Expect(err).NotTo(HaveOccurred())
|
|
|
|
// reset current thread's netns to the original
|
|
_, _, e1 := unix.Syscall(unix.SYS_SETNS, uintptr(originalNetNS), uintptr(unix.CLONE_NEWNET), 0)
|
|
Expect(e1).To(BeZero())
|
|
})()
|
|
|
|
wg.Wait()
|
|
|
|
return namespace
|
|
}
|
|
|
|
func RemoveNetworkNS(networkNS string) error {
|
|
err := unix.Unmount(networkNS, unix.MNT_DETACH)
|
|
|
|
err = os.RemoveAll(networkNS)
|
|
return err
|
|
}
|