From ed7892c7c20761ee0324eb96d140a77e51422bac Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Tue, 5 Dec 2023 09:29:34 +0900 Subject: [PATCH 1/2] go.mod: bump up github.com/containerd/containerd to v1.7.10 Signed-off-by: Kohei Tokunaga --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/containerd/containerd/.mailmap | 2 +- .../containerd/containerd/pkg/unpack/unpacker.go | 11 +++++++++-- .../containerd/remotes/docker/httpreadseeker.go | 10 ++++++++++ .../containerd/containerd/version/version.go | 2 +- vendor/modules.txt | 2 +- 7 files changed, 25 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 2d9062d43..6d441e8ee 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/s3 v1.30.6 github.com/aws/smithy-go v1.13.5 github.com/containerd/console v1.0.3 - github.com/containerd/containerd v1.7.9 + github.com/containerd/containerd v1.7.10 github.com/containerd/continuity v0.4.2 github.com/containerd/fuse-overlayfs-snapshotter v1.0.2 github.com/containerd/go-cni v1.1.9 diff --git a/go.sum b/go.sum index c771132b6..efbf2b8d7 100644 --- a/go.sum +++ b/go.sum @@ -313,8 +313,8 @@ github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMX github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.7.9 h1:KOhK01szQbM80YfW1H6RZKh85PHGqY/9OcEZ35Je8sc= -github.com/containerd/containerd v1.7.9/go.mod h1:0/W44LWEYfSHoxBtsHIiNU/duEkgpMokemafHVCpq9Y= +github.com/containerd/containerd v1.7.10 h1:2nfZyT8BV0C3iKu/SsGxKVAf9dp5W7l9nA8JmWmDGuo= +github.com/containerd/containerd v1.7.10/go.mod h1:0/W44LWEYfSHoxBtsHIiNU/duEkgpMokemafHVCpq9Y= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= diff --git a/vendor/github.com/containerd/containerd/.mailmap b/vendor/github.com/containerd/containerd/.mailmap index 34281d429..0ae88823a 100644 --- a/vendor/github.com/containerd/containerd/.mailmap +++ b/vendor/github.com/containerd/containerd/.mailmap @@ -50,7 +50,7 @@ haoyun Harry Zhang Hu Shuai Hu Shuai -Iceber Gu +Iceber Gu Jaana Burcu Dogan Jess Valarezo Jess Valarezo diff --git a/vendor/github.com/containerd/containerd/pkg/unpack/unpacker.go b/vendor/github.com/containerd/containerd/pkg/unpack/unpacker.go index b160da652..41e36c1f5 100644 --- a/vendor/github.com/containerd/containerd/pkg/unpack/unpacker.go +++ b/vendor/github.com/containerd/containerd/pkg/unpack/unpacker.go @@ -236,6 +236,7 @@ func (u *Unpacker) unpack( ctx := u.ctx ctx, layerSpan := tracing.StartSpan(ctx, tracing.Name(unpackSpanPrefix, "unpack")) defer layerSpan.End() + unpackStart := time.Now() p, err := content.ReadBlob(ctx, u.content, config) if err != nil { return err @@ -412,6 +413,7 @@ func (u *Unpacker) unpack( for i, desc := range layers { _, layerSpan := tracing.StartSpan(ctx, tracing.Name(unpackSpanPrefix, "unpackLayer")) + unpackLayerStart := time.Now() layerSpan.SetAttributes( tracing.Attribute("layer.media.type", desc.MediaType), tracing.Attribute("layer.media.size", desc.Size), @@ -423,6 +425,10 @@ func (u *Unpacker) unpack( return err } layerSpan.End() + log.G(ctx).WithFields(log.Fields{ + "layer": desc.Digest, + "duration": time.Since(unpackLayerStart), + }).Debug("layer unpacked") } chainID := identity.ChainID(chain).String() @@ -437,8 +443,9 @@ func (u *Unpacker) unpack( return err } log.G(ctx).WithFields(log.Fields{ - "config": config.Digest, - "chainID": chainID, + "config": config.Digest, + "chainID": chainID, + "duration": time.Since(unpackStart), }).Debug("image unpacked") return nil diff --git a/vendor/github.com/containerd/containerd/remotes/docker/httpreadseeker.go b/vendor/github.com/containerd/containerd/remotes/docker/httpreadseeker.go index 9a827ef04..824359339 100644 --- a/vendor/github.com/containerd/containerd/remotes/docker/httpreadseeker.go +++ b/vendor/github.com/containerd/containerd/remotes/docker/httpreadseeker.go @@ -76,6 +76,16 @@ func (hrs *httpReadSeeker) Read(p []byte) (n int, err error) { if _, err2 := hrs.reader(); err2 == nil { return n, nil } + } else if err == io.EOF { + // The CRI's imagePullProgressTimeout relies on responseBody.Close to + // update the process monitor's status. If the err is io.EOF, close + // the connection since there is no more available data. + if hrs.rc != nil { + if clsErr := hrs.rc.Close(); clsErr != nil { + log.L.WithError(clsErr).Error("httpReadSeeker: failed to close ReadCloser after io.EOF") + } + hrs.rc = nil + } } return } diff --git a/vendor/github.com/containerd/containerd/version/version.go b/vendor/github.com/containerd/containerd/version/version.go index 088c7f81b..df55b2ff2 100644 --- a/vendor/github.com/containerd/containerd/version/version.go +++ b/vendor/github.com/containerd/containerd/version/version.go @@ -23,7 +23,7 @@ var ( Package = "github.com/containerd/containerd" // Version holds the complete version number. Filled in at linking time. - Version = "1.7.9+unknown" + Version = "1.7.10+unknown" // Revision is filled with the VCS (e.g. git) revision being used to build // the program at linking time. diff --git a/vendor/modules.txt b/vendor/modules.txt index 395308430..7af927a79 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -244,7 +244,7 @@ github.com/containerd/cgroups/stats/v1 # github.com/containerd/console v1.0.3 ## explicit; go 1.13 github.com/containerd/console -# github.com/containerd/containerd v1.7.9 +# github.com/containerd/containerd v1.7.10 ## explicit; go 1.19 github.com/containerd/containerd github.com/containerd/containerd/api/events From 68014b4364fc25d671b75f89e76fb752c9df5b36 Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Tue, 5 Dec 2023 09:53:43 +0900 Subject: [PATCH 2/2] Dockerfile: Bump up containerd to v1.7.10 Signed-off-by: Kohei Tokunaga --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3c4040202..58f462aae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile-upstream:master ARG RUNC_VERSION=v1.1.10 -ARG CONTAINERD_VERSION=v1.7.7 +ARG CONTAINERD_VERSION=v1.7.10 # containerd v1.6 for integration tests ARG CONTAINERD_ALT_VERSION_16=v1.6.24 ARG REGISTRY_VERSION=2.8.3