Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow client to set boltdb timeout #140

Merged
merged 2 commits into from
Nov 9, 2016
Merged

Allow client to set boltdb timeout #140

merged 2 commits into from
Nov 9, 2016

Conversation

aboch
Copy link

@aboch aboch commented Oct 25, 2016

  • also in case of no persistent connection
  • Also fixing CI by bumping go version in .travis.yml

Related to moby/moby#26251
Related to moby/libnetwork#1374
Supersedes #135

Signed-off-by: Alessandro Boch aboch@docker.com

@@ -80,13 +81,15 @@ func New(endpoints []string, options *store.Config) (store.Store, error) {
if err != nil {
return nil, err
}
} else if options.ConnectionTimeout != 0 {
timeout = options.ConnectionTimeout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets make this unconditional because the options.ConnectionTimeout is used always. This way BoltDB.timeout will reflect the right value if at all it has to be used elsewhere.

- also in case of no persistent connection

Signed-off-by: Alessandro Boch <aboch@docker.com>
- To fix CI

Signed-off-by: Alessandro Boch <aboch@docker.com>
@sanimej
Copy link
Contributor

sanimej commented Nov 9, 2016

LGTM

@sanimej sanimej merged commit 1d84310 into docker:master Nov 9, 2016
bryant1410 pushed a commit to bryant1410/libkv that referenced this pull request Apr 18, 2017
Allow client to set boltdb timeout

Signed-off-by: Santiago Castro <santi.1410@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants