Revert "add a 10s timeout to the client object." #1893
Merged
Conversation
This file contains 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
This reverts commit 59defcb which caused docker#1892 since the timeout applied not only to the dial phase but to everything, so it would kill `docker logs -f ...` if the container was not chatty enough. Signed-off-by: Ian Campbell <ijc@docker.com>
|
I'll try and find another way to add a shorter timeout at |
Codecov Report
@@ Coverage Diff @@
## master #1893 +/- ##
=======================================
Coverage 56.75% 56.75%
=======================================
Files 309 309
Lines 21680 21680
=======================================
Hits 12305 12305
Misses 8476 8476
Partials 899 899 |
3 tasks
|
Thanks. |
ijc
pushed a commit
to ijc/go-connections
that referenced
this pull request
May 17, 2019
This helps to address docker/cli#1739, where an invalid `DOCKER_HOST` setting could result in a 64s delay (that's twice the delay here because the client was trying to hit the `/_ping` endpoint twice, which was addressed in moby/moby#39206) I made a previous attempt to fix this purely on the Docker cli side (docker/cli#1872) however that had the side effect of adding the timeout across the board and not just for the dial phase, which caused a regression for `docker logs -f` (docker/cli#1892) and so was reverted (docker/cli#1893). The new value of 10s is just based on a gut feeling, no initial connection should be taking that long in the real world unless something about the network link is pretty broken (e.g. bad dns perhaps), in which case affected users are surely pretty used to retrying things, better to fail faster in the normal case. Also drop the comment since the linked issue just shows that the original number, just like the new number, was arrived at fairly arbitrarily based on gut feelings (rather than anything empirical) so the reference is not really terribly useful. Signed-off-by: Ian Campbell <ijc@docker.com>
|
ping @silvin-lubecki |
thaJeztah
added
process/cherry-pick
status/2-code-review
and removed
status/0-triage
labels
|
Dumb question but, can't we override the timeout just for the logs command? |
|
The way the I raised docker/go-connections#63 to fix the dial timeout at the source without affecting the post-connection operation. I think that's the way to go -- LGTMs over there appreciated ;-) |
|
(Removed the "cherry-pick" label, because this was not in the 19.03 branch) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This reverts commit 59defcb (#1872) which caused #1892
since the timeout applied not only to the dial phase but to everything, so it
would kill
docker logs -f ...if the container was not chatty enough.Signed-off-by: Ian Campbell ijc@docker.com
fixes #1892
fixes docker/for-linux#669.