Update HTTP fallback to better account for TLS timeout and previous attempts#10109
Merged
mxpv merged 2 commits intocontainerd:mainfrom Apr 23, 2024
Merged
Update HTTP fallback to better account for TLS timeout and previous attempts#10109mxpv merged 2 commits intocontainerd:mainfrom
mxpv merged 2 commits intocontainerd:mainfrom
Conversation
Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
added
cherry-pick/1.6.x
cherry-pick/1.7.x
dmcgowan
force-pushed
the
fix-fallback-explicit-tls
branch
from
4036eee to
501cb67
Compare
dmcgowan
added
the
status/needs-major-release
dmcgowan
force-pushed
the
fix-fallback-explicit-tls
branch
from
501cb67 to
2a4c8e4
Compare
Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
force-pushed
the
fix-fallback-explicit-tls
branch
from
2a4c8e4 to
5e470e1
Compare
Member
Author
|
When backported to 1.6 and 1.7 I'll just keep the new function and the old type, just mark the old struct as deprecated. There is no need to keep the old struct since we will get this in before 2.0. |
fuweid
approved these changes
Apr 23, 2024
| return | ||
| } | ||
| go func() { | ||
| time.Sleep(time.Second) |
Member
There was a problem hiding this comment.
Hopefully, it's not flaky in CI env 😂 I mean that it maybe close before received timeout.
Member
Author
There was a problem hiding this comment.
We should probably test for connection closed as well 😆
mxpv
approved these changes
Apr 23, 2024
dmcgowan
added
cherry-picked/1.6.x
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
4 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.
A few relevant changes here to make the HTTP fallback more robust:
Fixes #10014