Fixed an endpoint delete issue with a possible stale sbox
Stale sandbox could be a result of stress tests on ungraceful
restarts such as #17984
Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 423b55c4b4aaaa55188b3aeca2b6b2005b19e7ea)
diff --git a/hack/vendor.sh b/hack/vendor.sh
index 161e0ac..daaec71 100755
--- a/hack/vendor.sh
+++ b/hack/vendor.sh
@@ -20,7 +20,7 @@
clone git golang.org/x/net 3cffabab72adf04f8e3b01c5baf775361837b5fe https://github.com/golang/net.git
#get libnetwork packages
-clone git github.com/docker/libnetwork e8ebc0bf6510343c88d162db08b3d855cbbe75b9
+clone git github.com/docker/libnetwork b4ddf18317b19d6e4bcc821145589749206a7d00
clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4
diff --git a/vendor/src/github.com/docker/libnetwork/endpoint.go b/vendor/src/github.com/docker/libnetwork/endpoint.go
index 02c7ba3..865f2aa 100644
--- a/vendor/src/github.com/docker/libnetwork/endpoint.go
+++ b/vendor/src/github.com/docker/libnetwork/endpoint.go
@@ -584,7 +584,8 @@
ep.Lock()
epid := ep.id
name := ep.name
- if ep.sandboxID != "" {
+ sb, _ := n.getController().SandboxByID(ep.sandboxID)
+ if sb != nil {
ep.Unlock()
return &ActiveContainerError{name: name, id: epid}
}
diff --git a/vendor/src/github.com/docker/libnetwork/store.go b/vendor/src/github.com/docker/libnetwork/store.go
index 1ea2f7a..a7682e5 100644
--- a/vendor/src/github.com/docker/libnetwork/store.go
+++ b/vendor/src/github.com/docker/libnetwork/store.go
@@ -176,7 +176,6 @@
for _, kvo := range kvol {
ep := kvo.(*endpoint)
- ep.network = n
epl = append(epl, ep)
}
}
