Skip to content

[release/1.7 backport] Fix retry logic and concurrency issue with http fallback#11032

Merged
estesp merged 3 commits into
containerd:release/1.7from
vvoland:httpfallback-backports-1.7
Nov 21, 2024
Merged

[release/1.7 backport] Fix retry logic and concurrency issue with http fallback#11032
estesp merged 3 commits into
containerd:release/1.7from
vvoland:httpfallback-backports-1.7

Conversation

@vvoland

@vvoland vvoland commented Nov 20, 2024

Copy link
Copy Markdown
Contributor

Allow fallback across default ports

When no port is specified in host, allow falling back from 443 to 80 when http is specified along with a TLS configuration. This increases the cases when https can be preferred and fixes a case where fallback does not happen after a connection refused where previously Docker would have fallen back.

Adds a mutex to protect fallback host

Fixes an issue with race detector complaining about concurrent access such as with Dispatch on push.

When no port is specified, allow falling back from 443 to 80 when
http is specified along with a TLS configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 02b6c69)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit d23c4b8)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Race detector complains about concurrent access such as with Dispatch on
push.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 38e2f00)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@k8s-ci-robot

Copy link
Copy Markdown

Hi @vvoland. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@dosubot dosubot Bot added the area/distribution Image Distribution label Nov 20, 2024
@austinvazquez

Copy link
Copy Markdown
Member

/ok-to-test

@dmcgowan dmcgowan changed the title [release/1.7 backport] remotes/httpFallback: Retry and concurrency fixes [release/1.7 backport] Fix retry logic and concurrency issue with http fallback Nov 20, 2024
@estesp estesp merged commit 80fda60 into containerd:release/1.7 Nov 21, 2024
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.

5 participants