From e755b439fa74f7831b960da9795dcb8ed32f6281 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Tue, 8 Nov 2016 18:37:29 -0800 Subject: [PATCH] Update libkv @1d84310 Signed-off-by: Alessandro Boch --- libnetwork/Godeps/Godeps.json | 27 +++++++++---------- .../src/github.com/docker/libkv/.travis.yml | 4 +-- .../src/github.com/docker/libkv/MAINTAINERS | 6 ----- .../docker/libkv/store/boltdb/boltdb.go | 7 ++++- .../docker/libkv/store/zookeeper/zookeeper.go | 2 +- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/libnetwork/Godeps/Godeps.json b/libnetwork/Godeps/Godeps.json index 8fa0717b35..8bb089fe06 100644 --- a/libnetwork/Godeps/Godeps.json +++ b/libnetwork/Godeps/Godeps.json @@ -1,7 +1,6 @@ { "ImportPath": "github.com/docker/libnetwork", - "GoVersion": "go1.5", - "GodepVersion": "v74", + "GoVersion": "go1.7", "Packages": [ "./..." ], @@ -218,33 +217,33 @@ }, { "ImportPath": "github.com/docker/libkv", - "Comment": "v0.2.0-1-g7283ef2", - "Rev": "7283ef27ed32fe267388510a91709b307bb9942c" + "Comment": "v0.2.1-5-g1d84310", + "Rev": "1d8431073ae03cdaedb198a89722f3aab6d418ef" }, { "ImportPath": "github.com/docker/libkv/store", - "Comment": "v0.2.0-1-g7283ef2", - "Rev": "7283ef27ed32fe267388510a91709b307bb9942c" + "Comment": "v0.2.1-5-g1d84310", + "Rev": "1d8431073ae03cdaedb198a89722f3aab6d418ef" }, { "ImportPath": "github.com/docker/libkv/store/boltdb", - "Comment": "v0.2.0-1-g7283ef2", - "Rev": "7283ef27ed32fe267388510a91709b307bb9942c" + "Comment": "v0.2.1-5-g1d84310", + "Rev": "1d8431073ae03cdaedb198a89722f3aab6d418ef" }, { "ImportPath": "github.com/docker/libkv/store/consul", - "Comment": "v0.2.0-1-g7283ef2", - "Rev": "7283ef27ed32fe267388510a91709b307bb9942c" + "Comment": "v0.2.1-5-g1d84310", + "Rev": "1d8431073ae03cdaedb198a89722f3aab6d418ef" }, { "ImportPath": "github.com/docker/libkv/store/etcd", - "Comment": "v0.2.0-1-g7283ef2", - "Rev": "7283ef27ed32fe267388510a91709b307bb9942c" + "Comment": "v0.2.1-5-g1d84310", + "Rev": "1d8431073ae03cdaedb198a89722f3aab6d418ef" }, { "ImportPath": "github.com/docker/libkv/store/zookeeper", - "Comment": "v0.2.0-1-g7283ef2", - "Rev": "7283ef27ed32fe267388510a91709b307bb9942c" + "Comment": "v0.2.1-5-g1d84310", + "Rev": "1d8431073ae03cdaedb198a89722f3aab6d418ef" }, { "ImportPath": "github.com/godbus/dbus", diff --git a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/.travis.yml b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/.travis.yml index f7cecbdf9c..a7a3bcffc7 100644 --- a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/.travis.yml +++ b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.5.3 + - 1.7.1 # let us have speedy Docker-based Travis workers sudo: false @@ -16,7 +16,7 @@ before_install: before_script: - script/travis_consul.sh 0.6.3 - - script/travis_etcd.sh 2.2.5 + - script/travis_etcd.sh 3.0.0 - script/travis_zk.sh 3.5.1-alpha script: diff --git a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/MAINTAINERS b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/MAINTAINERS index 4dd59c7e27..4a8bbc6135 100644 --- a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/MAINTAINERS +++ b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/MAINTAINERS @@ -11,7 +11,6 @@ [Org] [Org."Core maintainers"] people = [ - "abronan", "aluzzardi", "sanimej", "vieux", @@ -25,11 +24,6 @@ # ADD YOURSELF HERE IN ALPHABETICAL ORDER - [people.abronan] - Name = "Alexandre Beslic" - Email = "abronan@docker.com" - GitHub = "abronan" - [people.aluzzardi] Name = "Andrea Luzzardi" Email = "al@docker.com" diff --git a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/boltdb/boltdb.go b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/boltdb/boltdb.go index 4026e0a20c..cdfd74f878 100644 --- a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/boltdb/boltdb.go +++ b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/boltdb/boltdb.go @@ -59,6 +59,7 @@ func New(endpoints []string, options *store.Config) (store.Store, error) { db *bolt.DB err error boltOptions *bolt.Options + timeout = transientTimeout ) if len(endpoints) > 1 { @@ -82,11 +83,15 @@ func New(endpoints []string, options *store.Config) (store.Store, error) { } } + if options.ConnectionTimeout != 0 { + timeout = options.ConnectionTimeout + } + b := &BoltDB{ client: db, path: endpoints[0], boltBucket: []byte(options.Bucket), - timeout: transientTimeout, + timeout: timeout, PersistConnection: options.PersistConnection, } diff --git a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/zookeeper/zookeeper.go b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/zookeeper/zookeeper.go index 8a44ad318a..ff8d4ebe0f 100644 --- a/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/zookeeper/zookeeper.go +++ b/libnetwork/Godeps/_workspace/src/github.com/docker/libkv/store/zookeeper/zookeeper.go @@ -252,7 +252,7 @@ func (s *Zookeeper) List(directory string) ([]*store.KVPair, error) { pair, err := s.Get(strings.TrimSuffix(directory, "/") + s.normalize(key)) if err != nil { // If node is not found: List is out of date, retry - if err == zk.ErrNoNode { + if err == store.ErrKeyNotFound { return s.List(directory) } return nil, err