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

Use the greater of operation or socket timeout #57

Merged
merged 3 commits into from
Feb 19, 2016

Conversation

lukebakken
Copy link
Contributor

For commands that support an operation timeout, ensure that the socket timeout is at least as long of a duration.

Fixes #55 (CLIENTS-770)

@@ -23,8 +22,7 @@ func integrationTestsBuildCluster() *Cluster {
var cluster *Cluster
var err error
nodeOpts := &NodeOptions{
RemoteAddress: getRiakAddress(),
RequestTimeout: time.Second * 20,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was "artificially" set to 20 secs to prevent socket timeouts. No longer necessary as the operation timeout will be used if it's greater than the socket timeout.

lukebakken added a commit that referenced this pull request Feb 19, 2016
…outs

Use the greater of operation or socket timeout
@lukebakken lukebakken merged commit 746be30 into master Feb 19, 2016
@lukebakken lukebakken deleted the features/lrb/gh-55-per-command-timeouts branch February 19, 2016 00:36
@christophermancini
Copy link
Contributor

👍 Looks good. Sorry for the delayed review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants