From 484b451a3dc9cce59cc812b35951140b21910009 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 11 Feb 2016 09:44:02 -0800 Subject: [PATCH] vendor libnetwork v0.6.1-rc3 - fixes https://github.com/docker/docker/issues/20140 Signed-off-by: Madhu Venugopal --- hack/vendor.sh | 2 +- vendor/src/github.com/docker/libnetwork/CHANGELOG.md | 3 +++ vendor/src/github.com/docker/libnetwork/store.go | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hack/vendor.sh b/hack/vendor.sh index d872c8b555..2424c3f456 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -27,7 +27,7 @@ clone git github.com/RackSec/srslog 6eb773f331e46fbba8eecb8e794e635e75fc04de clone git github.com/imdario/mergo 0.2.1 #get libnetwork packages -clone git github.com/docker/libnetwork v0.6.1-rc2 +clone git github.com/docker/libnetwork v0.6.1-rc3 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/CHANGELOG.md b/vendor/src/github.com/docker/libnetwork/CHANGELOG.md index 2c66eaa575..f10bf8f417 100644 --- a/vendor/src/github.com/docker/libnetwork/CHANGELOG.md +++ b/vendor/src/github.com/docker/libnetwork/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 0.6.1-rc3 (2016-02-11) +- Fixes getNetworksFromStore to not fail on inconsistent network state + ## 0.6.1-rc2 (2016-02-09) - Fixes https://github.com/docker/docker/issues/20132 - Fixes https://github.com/docker/docker/issues/20140 diff --git a/vendor/src/github.com/docker/libnetwork/store.go b/vendor/src/github.com/docker/libnetwork/store.go index dbfdaa0371..3f7878cff7 100644 --- a/vendor/src/github.com/docker/libnetwork/store.go +++ b/vendor/src/github.com/docker/libnetwork/store.go @@ -139,7 +139,8 @@ func (c *controller) getNetworksFromStore() ([]*network, error) { ec := &endpointCnt{n: n} err = store.GetObject(datastore.Key(ec.Key()...), ec) if err != nil { - return nil, fmt.Errorf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err) + log.Warnf("could not find endpoint count key %s for network %s while listing: %v", datastore.Key(ec.Key()...), n.Name(), err) + continue } n.epCnt = ec