Skip to content

Fetch image with default platform only in TestExportAndImportMultiLayer#11881

Merged
fuweid merged 1 commit intocontainerd:mainfrom
djdongjin:fix-TestExportAndImportMultiLayer-flaky
Jun 4, 2025
Merged

Fetch image with default platform only in TestExportAndImportMultiLayer#11881
fuweid merged 1 commit intocontainerd:mainfrom
djdongjin:fix-TestExportAndImportMultiLayer-flaky

Conversation

@djdongjin
Copy link
Copy Markdown
Member

@djdongjin djdongjin commented May 21, 2025

TestExportAndImportMultiLayer has been very flaky due to upstream registry throttling/unavailability. E.g.,

https://github.com/containerd/containerd/actions/runs/15168768477/job/42653479864

    log_hook.go:47: time="2025-05-21T17:42:37.345336659Z" level=debug msg="fetch failed" func=docker.dockerFetcher.open file="/home/runner/work/containerd/containerd/core/remotes/docker/fetcher.go:470" digest="sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840" error="unexpected status code https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840: 503 Service Unavailable" mediatype=application/vnd.docker.image.rootfs.foreign.diff.tar.gzip size=116254563 testcase=TestExportAndImportMultiLayer url="https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840"

Notice this test fetches all platform images which is unnecessary I think. E.g., the 503 from mcr above caused Linux test failures. This change should reduce requests to mcr.microsoft.com.

@djdongjin
Fetch image with default platform only in TestExportAndImportMultiLayer
213337c 
`TestExportAndImportMultiLayer` has been very flaky due to upstream
registry throttling/unavailability. E.g.,

https://github.com/containerd/containerd/actions/runs/15168768477/job/42653479864

```shell
    log_hook.go:47: time="2025-05-21T17:42:37.345336659Z" level=debug msg="fetch failed" func=docker.dockerFetcher.open file="/home/runner/work/containerd/containerd/core/remotes/docker/fetcher.go:470" digest="sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840" error="unexpected status code https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840: 503 Service Unavailable" mediatype=application/vnd.docker.image.rootfs.foreign.diff.tar.gzip size=116254563 testcase=TestExportAndImportMultiLayer url="https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840"
```

Notice this test fetches all platform images which is
unnecessary I think. E.g., the 503 from mcr above caused Linux test failures.
This change should reduce requests to `mcr.microsoft.com`.

Signed-off-by: Jin Dong <[email protected]>
@github-project-automation github-project-automation Bot moved this to Needs Triage in Pull Request Review May 21, 2025
@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented May 21, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@djdongjin
Copy link
Copy Markdown
Member Author

djdongjin commented May 21, 2025

/test all

@djdongjin djdongjin marked this pull request as ready for review May 21, 2025 20:31
@dosubot dosubot Bot added the area/distribution Image Distribution label May 21, 2025
@akhilerm akhilerm mentioned this pull request May 23, 2025
Merged
@djdongjin
Copy link
Copy Markdown
Member Author

djdongjin commented May 23, 2025

@AkihiroSuda @dmcgowan could you help PTAL this PR? Thanks!

fuweid
fuweid reviewed May 23, 2025
View reviewed changes
Comment thread integration/client/import_test.go
@github-project-automation github-project-automation Bot moved this from Needs Triage to Review In Progress in Pull Request Review May 27, 2025
@fuweid fuweid added this pull request to the merge queue May 27, 2025
@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 27, 2025
@djdongjin
Copy link
Copy Markdown
Member Author

djdongjin commented Jun 4, 2025

still seeing the issue in recent runs https://github.com/containerd/containerd/actions/runs/15431726124/job/43430766180?pr=11578

    default:     log_hook.go:47: time="2025-06-04T02:06:53.509421293Z" level=debug msg="fetch failed" func=docker.dockerFetcher.open file="/vagrant/core/remotes/docker/fetcher.go:470" digest="sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840" error="unexpected status code https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840: 503 Service Unavailable" mediatype=application/vnd.docker.image.rootfs.foreign.diff.tar.gzip size=116254563 testcase=TestExportAndImportMultiLayer url="https://mcr.microsoft.com/v2/windows/nanoserver/blobs/sha256:5178da1ca6af8a14a235f58eb31955ca5f4c72f950d35f9bb67a8bd20232d840"

Can we merge this PR? 🙏 thanks @AkihiroSuda @dmcgowan @fuweid

@fuweid
Copy link
Copy Markdown
Member

fuweid commented Jun 4, 2025

I found this error show up in windows platform. so, it only works in linux platform.

@fuweid fuweid added this pull request to the merge queue Jun 4, 2025
@djdongjin
Copy link
Copy Markdown
Member Author

djdongjin commented Jun 4, 2025

I found this error show up in windows platform. so, it only works in linux platform.

Yeah it may appear in any platform pulling from MCR. My hope is by eliminating it on Linux, the CI can be less flaky :)

@github-merge-queue github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Jun 4, 2025
@fuweid fuweid added this pull request to the merge queue Jun 4, 2025
Merged via the queue into containerd:main with commit fc96544 Jun 4, 2025
58 checks passed
@github-project-automation github-project-automation Bot moved this from Review In Progress to Done in Pull Request Review Jun 4, 2025
@estesp
Copy link
Copy Markdown
Member

estesp commented Jun 4, 2025

/cherry-pick release/2.1

@estesp
Copy link
Copy Markdown
Member

estesp commented Jun 4, 2025

/cherry-pick release/2.0

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jun 4, 2025

@estesp: new pull request created: #11943

Details

In response to this:

/cherry-pick release/2.1

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 4, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Jun 4, 2025

@estesp: new pull request created: #11944

Details

In response to this:

/cherry-pick release/2.0

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Jun 4, 2025
Merged
@estesp estesp added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch labels Jun 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@henry118 henry118 henry118 approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

area/distribution Image Distribution cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch size/XS

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@djdongjin @k8s-ci-robot @fuweid @estesp @k8s-infra-cherrypick-robot @henry118