vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8 by thaJeztah · Pull Request #48544 · moby/moby

thaJeztah · 2024-09-24T07:43:56Z

relates to;

depends on vendor: github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 #48750
depends on vendor: google.golang.org/protobuf v1.34.2 #48751
depends on vendor: github.com/prometheus/client_golang v1.20.5 #48753
depends on vendor: github.com/go-logr/logr v1.4.2, github.com/cenkalti/backoff/v4 v4.3.0 #48752
depends on vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757
depends on vendor: github.com/Microsoft/hcsshim v0.12.7 #48790

vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8

full diff:

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah · 2024-09-24T08:13:21Z

I first tried only updating containerd to see how bad it was, and lots of failures;

=== Failed
=== FAIL: amd64.integration-cli TestDockerAPISuite/TestAPIImagesSaveAndLoad (0.60s)
    docker_api_images_test.go:29: assertion failed: 
        Command:  /usr/local/cli-integration/docker rmi sha256:2b969b1d2ed33aba9a51be0e4a2b52681f9e6c9fec4b54f0bbacbe8083106952
        ExitCode: 1
        Error:    exit status 1
        Stdout:   
        Stderr:   Error response from daemon: error deleting lease: NotFound: lease "moby-image-sha256:2b969b1d2ed33aba9a51be0e4a2b52681f9e6c9fec4b54f0bbacbe8083106952": not found
        
        
        Failures:
        ExitCode was 1 expected 0
        Expected no error
    --- FAIL: TestDockerAPISuite/TestAPIImagesSaveAndLoad (0.60s)

=== FAIL: amd64.integration-cli TestDockerAPISuite (95.97s)

=== FAIL: amd64.integration-cli TestDockerCLIBuildSuite/TestBuildSymlinkBasename (0.53s)
    docker_cli_build_test.go:4847: assertion failed: 
        Command:  /usr/local/cli-integration/docker run --rm testbuildbrokensymlink cat asymlink
        ExitCode: 1
        Error:    exit status 1
        Stdout:   
        Stderr:   cat: can't open 'asymlink': No such file or directory
        
        
        Failures:
        ExitCode was 1 expected 0
        Expected no error
    --- FAIL: TestDockerCLIBuildSuite/TestBuildSymlinkBasename (0.53s)

=== FAIL: amd64.integration-cli TestDockerCLIBuildSuite/TestBuildUsernamespaceValidateRemappedRoot (0.52s)
    docker_cli_build_test.go:576: assertion failed: 
        Command:  /usr/local/cli-integration/docker rmi testbuildusernamespacevalidateremappedroot
        ExitCode: 1
        Error:    exit status 1
        Stdout:   
        Stderr:   Error response from daemon: error deleting lease: NotFound: lease "moby-image-sha256:36cdba4dd38e737573d8479cf79623445d28cbd7fbac53e7865935efbf763e6f": not found
        
        
        Failures:
        ExitCode was 1 expected 0
        Expected no error
    --- FAIL: TestDockerCLIBuildSuite/TestBuildUsernamespaceValidateRemappedRoot (0.52s)

Now updating uses of the module to use the package again; this only changes uses locally, so not in (indirect) dependencies, so I expect those to no longer match the error-definitions, which can cause failures.

thaJeztah · 2024-09-24T09:32:32Z

Yeah, looks indeed that many tests are failing now, e.g.;

=== FAIL: frontend/dockerfile TestIntegration/TestFrontendDeduplicateSources/worker=dockerd/frontend=client (2.65s)
    dockerfile_provenance_test.go:1413: 
        	Error Trace:	/src/frontend/dockerfile/dockerfile_provenance_test.go:1413
        	            				/src/util/testutil/integration/run.go:97
        	            				/src/util/testutil/integration/run.go:211
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:09547cfe4df4ca03ddf33fa730d2d758140ca0f9b99f554a4004a4d08be146be: not found
        	Test:       	TestIntegration/TestFrontendDeduplicateSources/worker=dockerd/frontend=client

=== FAIL: frontend/dockerfile TestIntegration/TestFrontendDeduplicateSources/worker=dockerd/frontend=builtin (2.60s)
    dockerfile_provenance_test.go:1413: 
        	Error Trace:	/src/frontend/dockerfile/dockerfile_provenance_test.go:1413
        	            				/src/util/testutil/integration/run.go:97
        	            				/src/util/testutil/integration/run.go:211
        	Error:      	Received unexpected error:
        	            	NotFound: rpc error: code = NotFound desc = content digest sha256:2aae6c4bb997db2d6c37c859c97cd192c09a6e321b875456085b2fc58abe83c2: not found
        	Test:       	TestIntegration/TestFrontendDeduplicateSources/worker=dockerd/frontend=builtin

sandbox.go:138: time="2024-09-24T08:25:34.012163151Z" level=error msg=/moby.buildkit.v1.Control/Solve error="rpc error: code = Internal desc = commit failed: blob with expected digest sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 exists: already exists" spanID=ae1fcca9dda5faaa traceID=bca305682a9e1c79ea6b4dbe909709d1
sandbox.go:138: Internal: commit failed: blob with expected digest sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 exists: already exists
sandbox.go:138: 6825  /usr/bin/dockerd --data-root /tmp/integration3966967826/dgwoniebauqg2/root --exec-root /tmp/dxr/dgwoniebauqg2 --pidfile /tmp/integration3966967826/dgwoniebauqg2/docker.pid --containerd-namespace dgwoniebauqg2 --containerd-plugins-namespace dgwoniebauqg2p --host unix:///tmp/docker-integration/dgwoniebauqg2.sock --config-file /tmp/integration3966967826/daemon.json --userland-proxy=false --tls=false --debug
sandbox.go:138: github.com/docker/docker/api/server/router/grpc.unaryInterceptor
sandbox.go:138: 	/go/src/github.com/docker/docker/api/server/router/grpc/grpc.go:74
sandbox.go:138: google.golang.org/grpc.NewServer.chainUnaryServerInterceptors.chainUnaryInterceptors.func1
sandbox.go:138: 	/go/src/github.com/docker/docker/vendor/google.golang.org/grpc/server.go:1194
sandbox.go:138: github.com/moby/buildkit/api/services/control._Control_Solve_Handler
sandbox.go:138: 	/go/src/github.com/docker/docker/vendor/github.com/moby/buildkit/api/services/control/control.pb.go:2493
sandbox.go:138: google.golang.org/grpc.(*Server).processUnaryRPC
sandbox.go:138: 	/go/src/github.com/docker/docker/vendor/google.golang.org/grpc/server.go:1383
sandbox.go:138: google.golang.org/grpc.(*Server).handleStream
sandbox.go:138: 	/go/src/github.com/docker/docker/vendor/google.golang.org/grpc/server.go:1794
sandbox.go:138: google.golang.org/grpc.(*Server).serveStreams.func2.1
sandbox.go:138: 	/go/src/github.com/docker/docker/vendor/google.golang.org/grpc/server.go:1027
sandbox.go:138: runtime.goexit
sandbox.go:138: 	/usr/local/go/src/runtime/asm_amd64.s:1695
sandbox.go:138: 
sandbox.go:138: time="2024-09-24T08:25:34.012624135Z" level=debug msg="session finished: <nil>" spanID=05991962f11b5ba3 traceID=958bfcaf0130249e36e8889b2ee79551

This one also failing, although not immediately sure where this ties in to errors (it's consistently failing though);

=== FAIL: amd64.integration.build TestBuildkitHistoryTracePropagation (30.04s)
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Channel created" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] original dial target is: \"unix:///run/buildkit/buildkitd.sock\"" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] parsed dial target is: resolver.Target{URL:url.URL{Scheme:\"unix\", Opaque:\"\", User:(*url.Userinfo)(nil), Host:\"\", Path:\"/run/buildkit/buildkitd.sock\", RawPath:\"\", OmitHost:false, ForceQuery:false, RawQuery:\"\", Fragment:\"\", RawFragment:\"\"}}" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Channel authority set to \"localhost\"" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Resolver state updated: {\n  \"Addresses\": [\n    {\n      \"Addr\": \"/run/buildkit/buildkitd.sock\",\n      \"ServerName\": \"\",\n      \"Attributes\": {\n        \"\\u003c%!p(networktype.keyType=grpc.internal.transport.networktype)\\u003e\": \"unix\"\n      },\n      \"BalancerAttributes\": null,\n      \"Metadata\": null\n    }\n  ],\n  \"Endpoints\": [\n    {\n      \"Addresses\": [\n        {\n          \"Addr\": \"/run/buildkit/buildkitd.sock\",\n          \"ServerName\": \"\",\n          \"Attributes\": {\n            \"\\u003c%!p(networktype.keyType=grpc.internal.transport.networktype)\\u003e\": \"unix\"\n          },\n          \"BalancerAttributes\": null,\n          \"Metadata\": null\n        }\n      ],\n      \"Attributes\": null\n    }\n  ],\n  \"ServiceConfig\": null,\n  \"Attributes\": null\n} (resolver returned new addresses)" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Channel switches to new LB policy \"pick_first\"" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1 SubChannel #2] Subchannel created" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Channel Connectivity change to CONNECTING" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Channel exiting idle mode" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1 SubChannel #2] Subchannel Connectivity change to CONNECTING" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1 SubChannel #2] Subchannel picks a new address \"/run/buildkit/buildkitd.sock\" to connect" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1 SubChannel #2] Subchannel Connectivity change to READY" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Channel #1] Channel Connectivity change to READY" module=grpc
time="2024-09-24T08:28:33Z" level=info msg="[core] [Server #4] Server created" module=grpc
    build_traces_test.go:87: Waiting for trace to be available
    build_traces_test.go:88: timeout hit after 30s: trace not available yet
time="2024-09-24T08:29:03Z" level=info msg="[core] [Channel #1] Channel Connectivity change to SHUTDOWN" module=grpc
time="2024-09-24T08:29:03Z" level=info msg="[core] [Channel #1] Closing the name resolver" module=grpc
time="2024-09-24T08:29:03Z" level=info msg="[core] [Channel #1] ccBalancerWrapper: closing" module=grpc
time="2024-09-24T08:29:03Z" level=info msg="[core] [Channel #1 SubChannel #2] Subchannel Connectivity change to SHUTDOWN" module=grpc
time="2024-09-24T08:29:03Z" level=info msg="[core] [Channel #1 SubChannel #2] Subchannel deleted" module=grpc
time="2024-09-24T08:29:03Z" level=info msg="[core] [Channel #1] Channel deleted" module=grpc

thaJeztah · 2024-09-24T09:33:58Z

cc @dmcgowan

thaJeztah · 2024-10-12T17:32:57Z

OK, looks like we have one thing to address in hcsshim, because it doesn't compile;

# github.com/docker/docker/vendor/github.com/Microsoft/hcsshim/internal/oc
..\..\vendor\github.com\Microsoft\hcsshim\internal\oc\errors.go:21:39: undefined: errdefs.ToGRPC

moby/vendor/github.com/Microsoft/hcsshim/internal/oc/errors.go

Line 21 in c961924

if s, ok := status.FromError(errdefs.ToGRPC(err)); ok {

full diff: - containerd/containerd@v1.7.22...v1.7.23 - microsoft/hcsshim@v0.12.7...v0.12.8 Signed-off-by: Sebastiaan van Stijn <[email protected]>

austinvazquez

/lgtm

thaJeztah · 2024-11-06T09:34:24Z

Looks like this was merged from an outdated vendor state that didn't have the remotes/docker/config package, and that package didn't get updated to 1.7.23; fixing in;

fix vendor of github.com/containerd/containerd #48826

thaJeztah added area/runtime Runtime status/2-code-review area/dependencies labels Sep 24, 2024

thaJeztah added this to the 28.0.0 milestone Sep 24, 2024

thaJeztah force-pushed the vendor_containerd_1.7.23 branch from 876bf94 to 9e7df14 Compare September 24, 2024 08:11

thaJeztah force-pushed the vendor_containerd_1.7.23 branch from 9e7df14 to 39c6be0 Compare September 24, 2024 08:16

thaJeztah force-pushed the vendor_containerd_1.7.23 branch from 39c6be0 to 69bf2c9 Compare October 12, 2024 17:11

thaJeztah mentioned this pull request Oct 12, 2024

vendor: github.com/containerd/containerd v1.7.23 moby/buildkit#5421

Closed

thaJeztah self-assigned this Oct 12, 2024

thaJeztah force-pushed the vendor_containerd_1.7.23 branch 3 times, most recently from c5ede44 to 885a8da Compare October 24, 2024 20:30

thaJeztah force-pushed the vendor_containerd_1.7.23 branch 2 times, most recently from 06b9948 to 53b02c7 Compare October 25, 2024 11:20

thaJeztah mentioned this pull request Oct 25, 2024

vendor: go.opentelemetry.io/otel v1.28.0, go.opentelemetry.io/contrib v0.53.0 #48757

Merged

thaJeztah force-pushed the vendor_containerd_1.7.23 branch from 53b02c7 to 7f86051 Compare October 29, 2024 10:39

thaJeztah mentioned this pull request Oct 29, 2024

vendor: github.com/Microsoft/hcsshim v0.12.7 #48790

Merged

thaJeztah force-pushed the vendor_containerd_1.7.23 branch 3 times, most recently from 14b3ab4 to 45651fb Compare October 30, 2024 00:41

thaJeztah changed the title ~~vendor: github.com/containerd/containerd v1.7.23~~ vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8 Oct 30, 2024

thaJeztah mentioned this pull request Oct 30, 2024

[v0.17] Dependency updates moby/buildkit#5462

Merged

vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8

5f39567

full diff: - containerd/containerd@v1.7.22...v1.7.23 - microsoft/hcsshim@v0.12.7...v0.12.8 Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah force-pushed the vendor_containerd_1.7.23 branch from 45651fb to 5f39567 Compare October 30, 2024 08:19

thaJeztah marked this pull request as ready for review October 30, 2024 10:48

dmcgowan approved these changes Oct 30, 2024

View reviewed changes

This was referenced Oct 31, 2024

[27.x] Revert "vendor: github.com/moby/buildkit v0.17.0-rc1" #48802

Closed

Dockerfile/vendor: update containerd to v1.7.23 #48804

Closed

austinvazquez approved these changes Oct 31, 2024

View reviewed changes

vvoland approved these changes Oct 31, 2024

View reviewed changes

thaJeztah merged commit 6ac445c into moby:master Oct 31, 2024

thaJeztah deleted the vendor_containerd_1.7.23 branch October 31, 2024 19:41

thaJeztah mentioned this pull request Nov 6, 2024

fix vendor of github.com/containerd/containerd #48826

Merged

thaJeztah mentioned this pull request Nov 15, 2024

[27.x] vendor: github.com/containerd/containerd v1.7.23 #48880

Merged

thaJeztah mentioned this pull request Nov 27, 2024

[27.x backport] vendor: update buildkit to v0.18.2 #48949

Merged

5 tasks

thaJeztah mentioned this pull request Dec 19, 2024

[27.x backport] vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8 #49136

Merged

thaJeztah added the process/cherry-picked label Dec 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8#48544

vendor: github.com/containerd/containerd v1.7.23, hcsshim v0.12.8#48544
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:vendor_containerd_1.7.23

thaJeztah commented Sep 24, 2024 •

edited

Loading

Uh oh!

thaJeztah commented Sep 24, 2024

Uh oh!

thaJeztah commented Sep 24, 2024

Uh oh!

thaJeztah commented Sep 24, 2024

Uh oh!

thaJeztah commented Oct 12, 2024

Uh oh!

austinvazquez left a comment

Uh oh!

thaJeztah commented Nov 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

thaJeztah commented Sep 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!