From 780b0ff3bedb8e9dfd3ccf12300f35a1168cdc38 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Mon, 21 Nov 2016 14:07:51 -0800 Subject: [PATCH] Vendor libkv @ 1d84310 Signed-off-by: Alessandro Boch Upstream-commit: f9cff5e267b5e6eb9046286e8a4e43552da605eb Component: engine --- components/engine/vendor.conf | 2 +- .../vendor/github.com/docker/libkv/store/boltdb/boltdb.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index c9cd61c390..57827039d5 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -31,7 +31,7 @@ github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b github.com/hashicorp/memberlist 88ac4de0d1a0ca6def284b571342db3b777a4c37 github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870 -github.com/docker/libkv v0.2.1 +github.com/docker/libkv 1d8431073ae03cdaedb198a89722f3aab6d418ef github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25 github.com/vishvananda/netlink 482f7a52b758233521878cb6c5904b6bd63f3457 github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060 diff --git a/components/engine/vendor/github.com/docker/libkv/store/boltdb/boltdb.go b/components/engine/vendor/github.com/docker/libkv/store/boltdb/boltdb.go index 4026e0a20c..cdfd74f878 100644 --- a/components/engine/vendor/github.com/docker/libkv/store/boltdb/boltdb.go +++ b/components/engine/vendor/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, }