This repository was archived by the owner on Jan 30, 2020. It is now read-only.
registry: use etcd.Config.HeaderTimeoutPerRequest instead of internal timeout#1580
Merged
dongsupark merged 1 commit intocoreos:masterfrom May 19, 2016
Merged
Conversation
registry/etcd.go
Outdated
| keyPrefix string | ||
| } | ||
|
|
||
| func (r *EtcdRegistry) ctx() context.Context { |
Contributor
There was a problem hiding this comment.
This function doesn't add much value anymore - how about just inlining context.Background where it's called instead?
Contributor
|
awesome! One minor comment, LGTM other than that |
… timeout As etcd's keysAPI already supports HeaderTimeoutPerRequest, fleet should not handle request timeout on its own, but just pass on the timeout value to the etcd client. For that, set timeout only in etcd.Config.HeaderTimeoutPerRequest, and get rid of internal timeout handling from both EtcdRegistry and LeaseManager. Also remove EtcdRegistry.ctx(), and just call context.Background() directly, as suggested by Jon. Suggested-by: Jonathan Boulle <[email protected]> Partially resolves coreos#1397
dongsupark
force-pushed
the
dongsu/etcd-request-timeout
branch
from
e657804 to
36094ff
Compare
Author
|
@jonboulle Done. I removed |
Author
|
Merged #1580. Thanks. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As etcd's
keysAPIalready supportsHeaderTimeoutPerRequest, fleet should not handle request timeout on its own, but just pass on the timeout value to the etcd client. For that, set timeout only inetcd.Config.HeaderTimeoutPerRequest, and get rid of internal timeout handling from bothEtcdRegistryandLeaseManager.Suggested-by @jonboulle
Partially resolves #1397