Add dial timeout field to hosts toml configuration #11106

phillebaba · 2024-12-05T21:52:31Z

This change adds a dial timeout field to the hosts toml configuration to reduce the impact of a registry which is town or unable to connect to.

Fixes #10660

k8s-ci-robot · 2024-12-05T21:52:40Z

Hi @phillebaba. 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.

dmcgowan · 2024-12-05T23:51:12Z

docs/hosts.md

+## dial_timeout field
+
+`dial_timeout` is the maximum amount of time a dial will wait for
+a connect to complete.


Can you be clear what the default the is and the use case for this. I assume the primary use case for this is to make it much much shorter for some mirrors

Updated the description with the default and some more information about the use case.

djdongjin · 2024-12-09T03:23:03Z

core/remotes/docker/config/hosts.go

+				if host.dialTimeout != nil {
+					tr.DialContext = (&net.Dialer{
+						Timeout:       *host.dialTimeout,
+						KeepAlive:     30 * time.Second,
+						FallbackDelay: 300 * time.Millisecond,
+					}).DialContext
+				}


This will only take effect if line 184 is true

Also, we should set the current default value(30 sec) if host.dialTimeout has not been set.

Fixed this by adding a new condition which I thought I already had.

The default 30 seconds is set in the default transport which we clone. So if the dial timeout is not set it will be the default value.

utam0k · 2025-01-04T02:12:09Z

@phillebaba Thanks for your PR. If you are busy, I'm happy to carry this PR.

phillebaba · 2025-01-04T12:44:01Z

@utam0k sorry I was taking some time off during the holidays so have not looked at any of the review comments.

I have now update the PR to address the review comments.

kzys

LGTM. Thanks!

utam0k · 2025-01-17T05:32:33Z

@dmcgowan @djdongjin Could we merge this PR? PTAL 🙏

djdongjin

LGTM, thanks!

utam0k · 2025-01-31T06:09:01Z

@dmcgowan There seems to be a new release on February 13, so how about including that?
#11275 (comment)

djdongjin · 2025-01-31T18:44:17Z

There seems to be a new release on February 13, so how about including that?
#11275 (comment)

@utam0k just to clarify this is just my pure guess based on previous release cadence as I'm not a maintainer :) but I feel this PR is in good shape.

utam0k · 2025-02-02T00:54:22Z

@djdongjin Ops, I missed. You are right.

utam0k · 2025-03-14T01:17:58Z

@dmcgowan cc: @AkihiroSuda
It looks like some checks in CI were failed.

djdongjin · 2025-03-14T01:39:53Z

@phillebaba can you rebase this PR to fix the CI.

I think it's because your PR is based on a commit before 47c4dba (which removed time import). And now the CI is complaining it couldn't find the time import.

Signed-off-by: Philip Laine <philip.laine@gmail.com>

[release/2.0] Backport Add dial timeout field to hosts toml configuration #11106

containerd 2.1.0 Welcome to the v2.1.0 release of containerd! The first minor release of containerd 2.x focuses on continued stability alongside new features and improvements. This is the first time-based released for containerd. Most the feature set and core functionality has long been stable and harderened in production environments, so now we transition to a balance of timely delivery of new functionality with the same high confidence in stability and performance. * Add no_sync option to boost boltDB performance on ephemeral environments ([containerd#10745](containerd#10745)) * Add content create event ([containerd#11006](containerd#11006)) * Erofs snapshotter and differ ([containerd#10705](containerd#10705)) * Update CRI to use transfer service for image pull by default ([containerd#8515](containerd#8515)) * Support multiple cni plugin bin dirs ([containerd#11311](containerd#11311)) * Support container restore through CRI/Kubernetes ([containerd#10365](containerd#10365)) * Add OCI/Image Volume Source support ([containerd#10579](containerd#10579)) * Enable Writable cgroups for unprivileged containers ([containerd#11131](containerd#11131)) * Fix recursive RLock() mutex acquisition ([containerd/go-cni#126](containerd/go-cni#126)) * Support CNI STATUS Verb ([containerd/go-cni#123](containerd/go-cni#123)) * Retry last registry host on 50x responses ([containerd#11484](containerd#11484)) * Multipart layer fetch ([containerd#10177](containerd#10177)) * Enable HTTP debug and trace for transfer based puller ([containerd#10762](containerd#10762)) * Add support for unpacking custom media types ([containerd#11744](containerd#11744)) * Add dial timeout field to hosts toml configuration ([containerd#11106](containerd#11106)) * Expose Pod assigned IPs to NRI plugins ([containerd#10921](containerd#10921)) * Support multiple uid/gid mappings ([containerd#10722](containerd#10722)) * Fix race between serve and immediate shutdown on the server ([containerd/ttrpc#175](containerd/ttrpc#175)) * Update FreeBSD defaults and re-organize platform defaults ([containerd#11017](containerd#11017)) * Postpone cri config deprecations to v2.2 ([containerd#11684](containerd#11684)) * Remove deprecated dynamic library plugins ([containerd#11683](containerd#11683)) * Remove the support for Schema 1 images ([containerd#11681](containerd#11681)) Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Phil Estes * Akihiro Suda * Maksym Pavlenko * Jin Dong * Wei Fu * Sebastiaan van Stijn * Samuel Karp * Mike Brown * Adrien Delorme * Austin Vazquez * Akhil Mohan * Kazuyoshi Kato * Henry Wang * Gao Xiang * ningmingxiao * Krisztian Litkey * Yang Yang * Archit Kulkarni * Chris Henzie * Iceber Gu * Alexey Lunev * Antonio Ojea * Davanum Srinivas * Marat Radchenko * Michael Zappa * Paweł Gronowski * Rodrigo Campos * Alberto Garcia Hierro * Amit Barve * Andrey Smirnov * Divya * Etienne Champetier * Kirtana Ashok * Philip Laine * QiPing Wan * fengwei0328 * zounengren * Adrian Reber * Alfred Wingate * Amal Thundiyil * Athos Ribeiro * Brian Goff * Cesar Talledo * ChengyuZhu6 * Chongyi Zheng * Craig Ingram * Danny Canter * David Son * Fupan Li * HirazawaUi * Jing Xu * Jonathan A. Sternberg * Jose Fernandez * Kaita Nakamura * Kohei Tokunaga * Lei Liu * Marco Visin * Mike Baynton * Qiyuan Liang * Sameer * Shiming Zhang * Swagat Bora * Teresaliu * Tony Fang * Tõnis Tiigi * Vered Rosen * Vinayak Goyal * bo.jiang * chriskery * luchenhan * mahmut * zhaixiaojuan * **github.com/Microsoft/hcsshim** v0.12.9 -> v0.13.0-rc.3 * **github.com/cilium/ebpf** v0.11.0 -> v0.16.0 * **github.com/containerd/cgroups/v3** v3.0.3 -> v3.0.5 * **github.com/containerd/containerd/api** v1.8.0 -> v1.9.0 * **github.com/containerd/continuity** v0.4.4 -> v0.4.5 * **github.com/containerd/go-cni** v1.1.10 -> v1.1.12 * **github.com/containerd/imgcrypt/v2** v2.0.0-rc.1 -> v2.0.1 * **github.com/containerd/otelttrpc** ea5083fda723 -> v0.1.0 * **github.com/containerd/platforms** v1.0.0-rc.0 -> v1.0.0-rc.1 * **github.com/containerd/ttrpc** v1.2.6 -> v1.2.7 * **github.com/containerd/typeurl/v2** v2.2.2 -> v2.2.3 * **github.com/containernetworking/cni** v1.2.3 -> v1.3.0 * **github.com/containernetworking/plugins** v1.5.1 -> v1.7.1 * **github.com/containers/ocicrypt** v1.2.0 -> v1.2.1 * **github.com/davecgh/go-spew** d8f796af33cc -> v1.1.1 * **github.com/fsnotify/fsnotify** v1.7.0 -> v1.9.0 * **github.com/go-jose/go-jose/v4** v4.0.4 -> v4.0.5 * **github.com/google/go-cmp** v0.6.0 -> v0.7.0 * **github.com/grpc-ecosystem/grpc-gateway/v2** v2.22.0 -> v2.26.1 * **github.com/klauspost/compress** v1.17.11 -> v1.18.0 * **github.com/mdlayher/socket** v0.4.1 -> v0.5.1 * **github.com/moby/spdystream** v0.4.0 -> v0.5.0 * **github.com/moby/sys/user** v0.3.0 -> v0.4.0 * **github.com/opencontainers/image-spec** v1.1.0 -> v1.1.1 * **github.com/opencontainers/runtime-spec** v1.2.0 -> v1.2.1 * **github.com/opencontainers/selinux** v1.11.1 -> v1.12.0 * **github.com/pelletier/go-toml/v2** v2.2.3 -> v2.2.4 * **github.com/petermattis/goid** 4fcff4a6cae7 **_new_** * **github.com/pmezard/go-difflib** 5d4384ee4fb2 -> v1.0.0 * **github.com/prometheus/client_golang** v1.20.5 -> v1.22.0 * **github.com/prometheus/common** v0.55.0 -> v0.62.0 * **github.com/sasha-s/go-deadlock** v0.3.5 **_new_** * **github.com/smallstep/pkcs7** v0.1.1 **_new_** * **github.com/stretchr/testify** v1.9.0 -> v1.10.0 * **github.com/tchap/go-patricia/v2** v2.3.1 -> v2.3.2 * **github.com/urfave/cli/v2** v2.27.5 -> v2.27.6 * **github.com/vishvananda/netlink** v1.3.0 -> 0e7078ed04c8 * **github.com/vishvananda/netns** v0.0.4 -> v0.0.5 * **go.etcd.io/bbolt** v1.3.11 -> v1.4.0 * **go.opentelemetry.io/auto/sdk** v1.1.0 **_new_** * **go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc** v0.56.0 -> v0.60.0 * **go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp** v0.56.0 -> v0.60.0 * **go.opentelemetry.io/otel** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/otel/exporters/otlp/otlptrace** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/otel/metric** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/otel/sdk** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/otel/trace** v1.31.0 -> v1.35.0 * **go.opentelemetry.io/proto/otlp** v1.3.1 -> v1.5.0 * **golang.org/x/crypto** v0.28.0 -> v0.36.0 * **golang.org/x/exp** aacd6d4b4611 -> 2d47ceb2692f * **golang.org/x/mod** v0.21.0 -> v0.24.0 * **golang.org/x/net** v0.30.0 -> v0.38.0 * **golang.org/x/oauth2** v0.22.0 -> v0.27.0 * **golang.org/x/sync** v0.8.0 -> v0.14.0 * **golang.org/x/sys** v0.26.0 -> v0.33.0 * **golang.org/x/term** v0.25.0 -> v0.30.0 * **golang.org/x/text** v0.19.0 -> v0.23.0 * **golang.org/x/time** v0.3.0 -> v0.7.0 * **google.golang.org/genproto/googleapis/api** 5fefd90f89a9 -> 56aae31c358a * **google.golang.org/genproto/googleapis/rpc** 324edc3d5d38 -> 56aae31c358a * **google.golang.org/grpc** v1.67.1 -> v1.72.0 * **google.golang.org/protobuf** v1.35.1 -> v1.36.6 * **k8s.io/api** v0.31.2 -> v0.32.3 * **k8s.io/apimachinery** v0.31.2 -> v0.32.3 * **k8s.io/apiserver** v0.31.2 -> v0.32.3 * **k8s.io/client-go** v0.31.2 -> v0.32.3 * **k8s.io/cri-api** v0.31.2 -> v0.32.3 * **k8s.io/kubelet** v0.31.2 -> v0.32.3 * **k8s.io/utils** 18e509b52bc8 -> 3ea5e8cea738 * **sigs.k8s.io/json** bc3834ca7abd -> 9aa6b5e7a4b3 * **sigs.k8s.io/structured-merge-diff/v4** v4.4.1 -> v4.4.2 * **tags.cncf.io/container-device-interface** v0.8.0 -> v1.0.1 * **tags.cncf.io/container-device-interface/specs-go** v0.8.0 -> v1.0.0 Previous release can be found at [v2.0.0](https://github.com/containerd/containerd/releases/tag/v2.0.0) * `containerd-<VERSION>-<OS>-<ARCH>.tar.gz`: ✅Recommended. Dynamically linked with glibc 2.35 (Ubuntu 22.04). * `containerd-static-<VERSION>-<OS>-<ARCH>.tar.gz`: Statically linked. Expected to be used on Linux distributions that do not use glibc >= 2.35. Not position-independent. In addition to containerd, typically you will have to install [runc](https://github.com/opencontainers/runc/releases) and [CNI plugins](https://github.com/containernetworking/plugins/releases) from their official sites too. See also the [Getting Started](https://github.com/containerd/containerd/blob/main/docs/getting-started.md) documentation.

k8s-ci-robot added needs-ok-to-test size/M labels Dec 5, 2024

dosubot bot added the area/distribution Image Distribution label Dec 5, 2024

phillebaba force-pushed the feature/dial-timeout branch from c1c9e61 to e9b1458 Compare December 5, 2024 21:55

dmcgowan reviewed Dec 5, 2024

View reviewed changes

dmcgowan added the impact/changelog label Dec 6, 2024

djdongjin reviewed Dec 9, 2024

View reviewed changes

phillebaba force-pushed the feature/dial-timeout branch 2 times, most recently from 74c7668 to 8b5ae93 Compare January 4, 2025 12:43

phillebaba force-pushed the feature/dial-timeout branch from 8b5ae93 to 702c496 Compare January 4, 2025 12:49

kzys approved these changes Jan 10, 2025

View reviewed changes

djdongjin approved these changes Jan 17, 2025

View reviewed changes

phillebaba mentioned this pull request Jan 22, 2025

"could not get peer id" and timeouts since 0.0.29 spegel-org/spegel#709

Closed

phillebaba mentioned this pull request Feb 20, 2025

Preventing scenario where we end up being unable to pull any images, including spegel itself spegel-org/spegel#739

Closed

AkihiroSuda approved these changes Mar 13, 2025

View reviewed changes

github-project-automation bot moved this from Needs Triage to Review In Progress in Pull Request Review Mar 13, 2025

AkihiroSuda added this pull request to the merge queue Mar 13, 2025

AkihiroSuda added the cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch label Mar 13, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 13, 2025

AkihiroSuda added this pull request to the merge queue Mar 14, 2025

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 14, 2025

Add dial timeout field to hosts toml configuration

c4982bf

Signed-off-by: Philip Laine <philip.laine@gmail.com>

dmcgowan force-pushed the feature/dial-timeout branch from 702c496 to c4982bf Compare March 14, 2025 06:35

dmcgowan approved these changes Mar 14, 2025

View reviewed changes

estesp approved these changes Mar 14, 2025

View reviewed changes

estesp added this pull request to the merge queue Mar 14, 2025

Merged via the queue into containerd:main with commit bc8b622 Mar 14, 2025
56 checks passed

github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Mar 14, 2025

dmcgowan mentioned this pull request Apr 23, 2025

Add release notes for v2.1.0-rc.0 #11752

Merged

dmcgowan mentioned this pull request May 7, 2025

Prepare release notes for v2.1.0 #11819

Merged

phillebaba mentioned this pull request May 13, 2025

Add dial timeout configuration in Containerd mirror configuration spegel-org/spegel#878

Merged

dimitar-kostadinov mentioned this pull request Jun 19, 2025

Broken registry cache block operatingsystemconfig reconcile gardener/gardener-extension-registry-cache#408

Open

dhalturin mentioned this pull request Jul 1, 2025

Severe delays in containerd image pulls when one of registry mirror is unreachable bottlerocket-os/bottlerocket#4564

Closed

jfremy-openai mentioned this pull request Jul 23, 2025

[release/2.0] Add dial timeout field to hosts toml configuration #12136

Merged

estesp added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch needs-ok-to-test labels Jul 31, 2025

estesp added a commit that referenced this pull request Jul 31, 2025

Merge pull request #12136 from jfremy-openai/backport-878-to-2-0

80c779d

[release/2.0] Backport Add dial timeout field to hosts toml configuration #11106

hanlins mentioned this pull request Aug 1, 2025

Introduce a liveness probe to spegel spegel-org/spegel#945

Closed

austinvazquez mentioned this pull request Nov 5, 2025

[release/2.0] Prepare release notes for v2.0.7 #12482

Merged

Add dial timeout field to hosts toml configuration #11106

Add dial timeout field to hosts toml configuration #11106

Uh oh!

Conversation

phillebaba commented Dec 5, 2024

Uh oh!

k8s-ci-robot commented Dec 5, 2024

Uh oh!

dmcgowan Dec 5, 2024

Choose a reason for hiding this comment

Uh oh!

phillebaba Jan 4, 2025

Choose a reason for hiding this comment

Uh oh!

djdongjin Dec 9, 2024

Choose a reason for hiding this comment

Uh oh!

utam0k Dec 15, 2024

Choose a reason for hiding this comment

Uh oh!

phillebaba Jan 4, 2025

Choose a reason for hiding this comment

Uh oh!

utam0k commented Jan 4, 2025

Uh oh!

phillebaba commented Jan 4, 2025

Uh oh!

kzys left a comment

Choose a reason for hiding this comment

Uh oh!

utam0k commented Jan 17, 2025

Uh oh!

djdongjin left a comment

Choose a reason for hiding this comment

Uh oh!

utam0k commented Jan 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

djdongjin commented Jan 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

utam0k commented Feb 2, 2025

Uh oh!

Uh oh!

Uh oh!

utam0k commented Mar 14, 2025

Uh oh!

djdongjin commented Mar 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

utam0k commented Jan 31, 2025 •

edited

Loading

djdongjin commented Jan 31, 2025 •

edited

Loading

djdongjin commented Mar 14, 2025 •

edited

Loading