kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix watchMiss thread context

Browse source 
The netlink deserialize is fetching information from the link.
This require the go routine to be in the correct namespace to
succeed

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
This commit is contained in:
Flavio Crisciani 2018-01-10 13:49:19 -08:00
parent 93f8337ec9
commit e975f3caa0
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libnetwork/drivers/overlay/ov_network.go
View file

@ -711,7 +711,7 @@ func (n *network) initSandbox(restore bool) error {
n.setNetlinkSocket(nlSock) n.setNetlinkSocket(nlSock)
if err == nil { if err == nil {
go n.watchMiss(nlSock) go n.watchMiss(nlSock, key)
} else { } else {
logrus.Errorf("failed to subscribe to neighbor group netlink messages for overlay network %s in sbox %s: %v", logrus.Errorf("failed to subscribe to neighbor group netlink messages for overlay network %s in sbox %s: %v",
n.id, sbox.Key(), err) n.id, sbox.Key(), err)
@ -720,7 +720,23 @@ func (n *network) initSandbox(restore bool) error {
return nil return nil
} }
func (n *network) watchMiss(nlSock *nl.NetlinkSocket) { func (n *network) watchMiss(nlSock *nl.NetlinkSocket, nsPath string) {
// With the new version of the netlink library the deserialize function makes
// requests about the interface of the netlink message. This can succeed only
// if this go routine is in the target namespace. For this reason following we
// lock the thread on that namespace
runtime.LockOSThread()
defer runtime.UnlockOSThread()
newNs, err := netns.GetFromPath(nsPath)
if err != nil {
logrus.WithError(err).Errorf("failed to get the namespace %s", nsPath)
return
}
defer newNs.Close()
if err = netns.Set(newNs); err != nil {
logrus.WithError(err).Errorf("failed to enter the namespace %s", nsPath)
return
}
for { for {
msgs, err := nlSock.Receive() msgs, err := nlSock.Receive()
if err != nil { if err != nil {

4
libnetwork/drivers/overlay/overlay_test.go
View file

@ -2,7 +2,9 @@ package overlay
import ( import (
"context" "context"
"fmt"
"net" "net"
"os"
"syscall" "syscall"
"testing" "testing"
"time" "time"
@ -158,7 +160,7 @@ func TestNetlinkSocket(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel() defer cancel()
go func() { go func() {
n.watchMiss(nlSock) n.watchMiss(nlSock, fmt.Sprintf("/proc/%d/task/%d/ns/net", os.Getpid(), syscall.Gettid()))
ch <- nil ch <- nil
}() }()
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)