Merge pull request #1911 from cpuguy83/fix_missing_lockosthread_master

Lock goroutine to OS thread while changing NS
moby · Aug 16, 2017 · 5b28c0e · 5b28c0e
2 parents 860637f + 97725cd
commit 5b28c0e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/drivers/overlay/ov_network.go b/drivers/overlay/ov_network.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -81,6 +82,10 @@ func setDefaultVlan() {
 		logrus.Error("insufficient number of arguments")
 		os.Exit(1)
 	}
+
+	runtime.LockOSThread()
+	defer runtime.UnlockOSThread()
+
 	nsPath := os.Args[1]
 	ns, err := netns.GetFromPath(nsPath)
 	if err != nil {