Don't disable HTTP keep-alives for remote storage connections.#3173
Merged
brian-brazil merged 1 commit intoprometheus:masterfrom Oct 5, 2017
Merged
Don't disable HTTP keep-alives for remote storage connections.#3173brian-brazil merged 1 commit intoprometheus:masterfrom
brian-brazil merged 1 commit intoprometheus:masterfrom
Conversation
Contributor
|
@fabxc Should we just hardcode to enabled everywhere to make things easier for merging 2.0? https://github.com/prometheus/prometheus/blob/dev-2.0/util/httputil/client.go |
Member
|
If we switched on keep-alive everywhere in 1.x, we might break people's setup with ulimits on fd count. To get this merged for the 1.8 release, can we keep it the way it currently is in this PR? |
Contributor
|
I'm okay with merging as-is (or even disabling keep alive for remote read in 1.x and leaving it to 2.x), I would like @fabxc's opinion first though as any merge conflicts with 2.x will mostly affect him. |
Contributor
|
I've discussed with @fabxc and we'll do things per this PR. Can you make the tests pass? |
8eeb6c2 to
a6cc196
Compare
Removes configurability introduced in prometheus#3160 in favour of hard-coding, per advice from @brian-brazil.
Contributor
|
Thanks! |
tomwilkie
pushed a commit
to tomwilkie/prometheus
that referenced
this pull request
Oct 26, 2017
… to 2.0 (see prometheus#3173) Removes configurability introduced in prometheus#3160 in favour of hard-coding, per advice from @brian-brazil.
tomwilkie
added a commit
to tomwilkie/prometheus
that referenced
this pull request
Oct 26, 2017
…ctions.' to 2.0 (see prometheus#3173)" This reverts commit 0997191.
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Removes configurability introduced in #3160 in favour of hard-coding, per advice from @brian-brazil.
The slightly unwieldy
NewClientFromConfigAndOptions()is introduced to avoid changing the 13+ other calls toNewClientFromConfig()in this repo and presumably more downstream.