From b6c875c8bb25ebd381481a9517daf5f56950f487 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Wed, 16 Aug 2017 15:05:59 -0700 Subject: [PATCH] vndr libnetwork to bring in lock fix Signed-off-by: Andrew Hsu --- components/engine/vendor.conf | 2 +- .../docker/libnetwork/drivers/overlay/ov_network.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 596aca9277e..14f083085d7 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -27,7 +27,7 @@ github.com/imdario/mergo 0.2.1 golang.org/x/sync de49d9dcd27d4f764488181bea099dfe6179bcf0 #get libnetwork packages -github.com/docker/libnetwork 230db20572a70538227b65ca72f7627c8b2bae41 +github.com/docker/libnetwork 4a242dba7739bb7d4351b260863b5e8789ea5abe github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec diff --git a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go b/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go index 9575350bf61..ea2688d966c 100644 --- a/components/engine/vendor/github.com/docker/libnetwork/drivers/overlay/ov_network.go +++ b/components/engine/vendor/github.com/docker/libnetwork/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 {