From b103bee4cc1b0aa5e622b3cc54fc984f453afe63 Mon Sep 17 00:00:00 2001 From: Daniel Canter Date: Wed, 10 Nov 2021 16:26:18 -0800 Subject: [PATCH] go.mod: Bump hcsshim to v0.9.1 This tag contains some changes for the Windows shim for retrying stdio named pipe connections if containerd restarts. It also is built with v1.1.0 of ttrpc which has some fixes for a deadlock we'd observed on Windows. Signed-off-by: Daniel Canter --- go.mod | 2 +- go.sum | 4 +- integration/client/go.mod | 2 +- integration/client/go.sum | 4 +- .../options/runhcs.pb.go | 156 +++++++++++------- .../options/runhcs.proto | 5 + vendor/github.com/Microsoft/hcsshim/go.mod | 3 +- vendor/github.com/Microsoft/hcsshim/go.sum | 8 +- vendor/modules.txt | 2 +- 9 files changed, 116 insertions(+), 70 deletions(-) diff --git a/go.mod b/go.mod index 0c25dcea6..c14a00b04 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 github.com/Microsoft/go-winio v0.5.0 - github.com/Microsoft/hcsshim v0.9.0 + github.com/Microsoft/hcsshim v0.9.1 github.com/containerd/aufs v1.0.0 github.com/containerd/btrfs v1.0.0 github.com/containerd/cgroups v1.0.2 diff --git a/go.sum b/go.sum index 1d9fefe2a..705e0e4fa 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXG github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.9.0 h1:BBgYMxl5YZDZVIijz02AlDINpYZOzQqRNCl9CZM13vk= -github.com/Microsoft/hcsshim v0.9.0/go.mod h1:VBJWdC71NSWPlEo7lwde1aL21748J8B6Sdgno7NqEGE= +github.com/Microsoft/hcsshim v0.9.1 h1:VfDCj+QnY19ktX5TsH22JHcjaZ05RWQiwDbOyEg5ziM= +github.com/Microsoft/hcsshim v0.9.1/go.mod h1:Y/0uV2jUab5kBI7SQgl62at0AVX7uaruzADAVmxm3eM= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= diff --git a/integration/client/go.mod b/integration/client/go.mod index 59c3a89ae..ea9e0bd0a 100644 --- a/integration/client/go.mod +++ b/integration/client/go.mod @@ -3,7 +3,7 @@ module github.com/containerd/containerd/integration/client go 1.15 require ( - github.com/Microsoft/hcsshim v0.9.0 + github.com/Microsoft/hcsshim v0.9.1 github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 github.com/containerd/cgroups v1.0.2 // the actual version of containerd is replaced with the code at the root of this repository diff --git a/integration/client/go.sum b/integration/client/go.sum index 1fcf4e08e..b10874835 100644 --- a/integration/client/go.sum +++ b/integration/client/go.sum @@ -48,8 +48,8 @@ github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpz github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.9.0 h1:BBgYMxl5YZDZVIijz02AlDINpYZOzQqRNCl9CZM13vk= -github.com/Microsoft/hcsshim v0.9.0/go.mod h1:VBJWdC71NSWPlEo7lwde1aL21748J8B6Sdgno7NqEGE= +github.com/Microsoft/hcsshim v0.9.1 h1:VfDCj+QnY19ktX5TsH22JHcjaZ05RWQiwDbOyEg5ziM= +github.com/Microsoft/hcsshim v0.9.1/go.mod h1:Y/0uV2jUab5kBI7SQgl62at0AVX7uaruzADAVmxm3eM= github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1 h1:pVKfKyPkXna29XlGjxSr9J0A7vNucOUHZ/2ClcTWalw= github.com/Microsoft/hcsshim/test v0.0.0-20210408205431-da33ecd607e1/go.mod h1:Cmvnhlie15Ha2UYrJs9EhgSx76Bq9RV2FgfEiT78GhI= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= diff --git a/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go index fe11f8a2b..89aff3723 100644 --- a/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go +++ b/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go @@ -139,7 +139,11 @@ type Options struct { // log_level specifies the logrus log level for the shim. Supported values are a string representation of the // logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override // the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent. - LogLevel string `protobuf:"bytes,16,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"` + LogLevel string `protobuf:"bytes,16,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"` + // io_retry_timeout_in_sec is the timeout in seconds for how long to try and reconnect to an upstream IO provider if a connection is lost. + // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite + // timeout. + IoRetryTimeoutInSec int32 `protobuf:"varint,17,opt,name=io_retry_timeout_in_sec,json=ioRetryTimeoutInSec,proto3" json:"io_retry_timeout_in_sec,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -238,65 +242,67 @@ func init() { } var fileDescriptor_b643df6839c75082 = []byte{ - // 920 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5b, 0x6f, 0xdb, 0x36, - 0x14, 0xc7, 0xad, 0x26, 0x71, 0xac, 0x93, 0x9b, 0xc3, 0x05, 0x98, 0x90, 0xac, 0xb6, 0x91, 0x0e, - 0x68, 0x8a, 0x35, 0x52, 0xd2, 0x3d, 0x6e, 0xc0, 0xd0, 0xd8, 0x4e, 0xeb, 0x21, 0x17, 0x43, 0xce, - 0xd2, 0x5d, 0x1e, 0x08, 0x5d, 0x18, 0x59, 0xa8, 0x28, 0x0a, 0x24, 0xed, 0xc5, 0x7d, 0xda, 0x47, - 0xd8, 0xc7, 0xca, 0xe3, 0x1e, 0x07, 0x0c, 0xc8, 0x56, 0x7f, 0x88, 0x3d, 0x0f, 0xa4, 0xa8, 0xb4, - 0x0b, 0x82, 0xbd, 0xec, 0xc9, 0xe4, 0xff, 0xfc, 0xf8, 0xe7, 0xe1, 0x21, 0x8f, 0x05, 0xe7, 0x49, - 0x2a, 0xc7, 0x93, 0xd0, 0x8d, 0x18, 0xf5, 0x4e, 0xd3, 0x88, 0x33, 0xc1, 0xae, 0xa4, 0x37, 0x8e, - 0x84, 0x18, 0xa7, 0xd4, 0x8b, 0x68, 0xec, 0x45, 0x2c, 0x97, 0x41, 0x9a, 0x13, 0x1e, 0xef, 0x2b, - 0x6d, 0x9f, 0x4f, 0xf2, 0x71, 0x24, 0xf6, 0xa7, 0x87, 0x1e, 0x2b, 0x64, 0xca, 0x72, 0xe1, 0x95, - 0x8a, 0x5b, 0x70, 0x26, 0x19, 0xda, 0xfa, 0xc0, 0xbb, 0x26, 0x30, 0x3d, 0xdc, 0xde, 0x4a, 0x58, - 0xc2, 0x34, 0xe0, 0xa9, 0x51, 0xc9, 0x6e, 0xb7, 0x13, 0xc6, 0x92, 0x8c, 0x78, 0x7a, 0x16, 0x4e, - 0xae, 0x3c, 0x99, 0x52, 0x22, 0x64, 0x40, 0x8b, 0x12, 0xd8, 0xfd, 0xbb, 0x0e, 0xcb, 0xe7, 0xe5, - 0x2e, 0x68, 0x0b, 0x96, 0x62, 0x12, 0x4e, 0x12, 0xc7, 0xea, 0x58, 0x7b, 0x0d, 0xbf, 0x9c, 0xa0, - 0x63, 0x00, 0x3d, 0xc0, 0x72, 0x56, 0x10, 0xe7, 0x51, 0xc7, 0xda, 0x5b, 0x7f, 0xf1, 0xd4, 0x7d, - 0x28, 0x07, 0xd7, 0x18, 0xb9, 0x3d, 0xc5, 0x5f, 0xcc, 0x0a, 0xe2, 0xdb, 0x71, 0x35, 0x44, 0x4f, - 0x60, 0x8d, 0x93, 0x24, 0x15, 0x92, 0xcf, 0x30, 0x67, 0x4c, 0x3a, 0x0b, 0x1d, 0x6b, 0xcf, 0xf6, - 0x57, 0x2b, 0xd1, 0x67, 0x4c, 0x2a, 0x48, 0x04, 0x79, 0x1c, 0xb2, 0x6b, 0x9c, 0xd2, 0x20, 0x21, - 0xce, 0x62, 0x09, 0x19, 0x71, 0xa0, 0x34, 0xf4, 0x0c, 0x9a, 0x15, 0x54, 0x64, 0x81, 0xbc, 0x62, - 0x9c, 0x3a, 0x4b, 0x9a, 0xdb, 0x30, 0xfa, 0xd0, 0xc8, 0xe8, 0x27, 0xd8, 0xbc, 0xf3, 0x13, 0x2c, - 0x0b, 0x54, 0x7e, 0x4e, 0x5d, 0x9f, 0xc1, 0xfd, 0xef, 0x33, 0x8c, 0xcc, 0x8e, 0xd5, 0x2a, 0xbf, - 0xda, 0xf3, 0x4e, 0x41, 0x1e, 0x6c, 0x85, 0x8c, 0x49, 0x7c, 0x95, 0x66, 0x44, 0xe8, 0x33, 0xe1, - 0x22, 0x90, 0x63, 0x67, 0x59, 0xe7, 0xb2, 0xa9, 0x62, 0xc7, 0x2a, 0xa4, 0x4e, 0x36, 0x0c, 0xe4, - 0x18, 0x3d, 0x07, 0x34, 0xa5, 0xb8, 0xe0, 0x2c, 0x22, 0x42, 0x30, 0x8e, 0x23, 0x36, 0xc9, 0xa5, - 0xd3, 0xe8, 0x58, 0x7b, 0x4b, 0x7e, 0x73, 0x4a, 0x87, 0x55, 0xa0, 0xab, 0x74, 0xe4, 0xc2, 0xd6, - 0x94, 0x62, 0x4a, 0x28, 0xe3, 0x33, 0x2c, 0xd2, 0x77, 0x04, 0xa7, 0x39, 0xa6, 0xa1, 0x63, 0x57, - 0xfc, 0xa9, 0x0e, 0x8d, 0xd2, 0x77, 0x64, 0x90, 0x9f, 0x86, 0xa8, 0x05, 0xf0, 0x6a, 0xf8, 0xdd, - 0xe5, 0xeb, 0x9e, 0xda, 0xcb, 0x01, 0x9d, 0xc4, 0x47, 0x0a, 0xfa, 0x1a, 0x76, 0x44, 0x14, 0x64, - 0x04, 0x47, 0xc5, 0x04, 0x67, 0x29, 0x4d, 0xa5, 0xc0, 0x92, 0x61, 0x73, 0x2c, 0x67, 0x45, 0x5f, - 0xfa, 0xa7, 0x1a, 0xe9, 0x16, 0x93, 0x13, 0x0d, 0x5c, 0x30, 0x53, 0x07, 0x74, 0x0a, 0x9f, 0xc7, - 0xe4, 0x2a, 0x98, 0x64, 0x12, 0xdf, 0xd5, 0x0d, 0x8b, 0x88, 0x07, 0x32, 0x1a, 0xdf, 0x65, 0x97, - 0x84, 0xce, 0xaa, 0xce, 0xae, 0x6d, 0xd8, 0x6e, 0x85, 0x8e, 0x4a, 0xb2, 0x4c, 0xf6, 0x55, 0x88, - 0xbe, 0x81, 0xc7, 0x95, 0xdd, 0x94, 0x3e, 0xe4, 0xb3, 0xa6, 0x7d, 0x1c, 0x03, 0x5d, 0xd2, 0xfb, - 0x06, 0xea, 0xa5, 0x8c, 0x03, 0x4e, 0xaa, 0xb5, 0xce, 0xba, 0xce, 0x7f, 0x55, 0x8b, 0x06, 0x46, - 0x1d, 0x58, 0x39, 0xeb, 0x0e, 0x39, 0xbb, 0x9e, 0xbd, 0x8c, 0x63, 0xee, 0x6c, 0xe8, 0x9a, 0x7c, - 0x2c, 0xa1, 0x1d, 0xb0, 0x33, 0x96, 0xe0, 0x8c, 0x4c, 0x49, 0xe6, 0x34, 0x75, 0xbc, 0x91, 0xb1, - 0xe4, 0x44, 0xcd, 0x77, 0x9f, 0x81, 0x7d, 0xf7, 0x94, 0x91, 0x0d, 0x4b, 0x67, 0xc3, 0xc1, 0xb0, - 0xdf, 0xac, 0xa1, 0x06, 0x2c, 0x1e, 0x0f, 0x4e, 0xfa, 0x4d, 0x0b, 0x2d, 0xc3, 0x42, 0xff, 0xe2, - 0x4d, 0xf3, 0xd1, 0xae, 0x07, 0xcd, 0xfb, 0x2f, 0x06, 0xad, 0xc0, 0xf2, 0xd0, 0x3f, 0xef, 0xf6, - 0x47, 0xa3, 0x66, 0x0d, 0xad, 0x03, 0xbc, 0xfe, 0x61, 0xd8, 0xf7, 0x2f, 0x07, 0xa3, 0x73, 0xbf, - 0x69, 0xed, 0xfe, 0xb1, 0x00, 0xeb, 0xe6, 0xc2, 0x7b, 0x44, 0x06, 0x69, 0x26, 0xd0, 0x63, 0x00, - 0xfd, 0xe8, 0x71, 0x1e, 0x50, 0xa2, 0x9b, 0xd0, 0xf6, 0x6d, 0xad, 0x9c, 0x05, 0x94, 0xa0, 0x2e, - 0x40, 0xc4, 0x49, 0x20, 0x49, 0x8c, 0x03, 0xa9, 0x1b, 0x71, 0xe5, 0xc5, 0xb6, 0x5b, 0x36, 0xb8, - 0x5b, 0x35, 0xb8, 0x7b, 0x51, 0x35, 0xf8, 0x51, 0xe3, 0xe6, 0xb6, 0x5d, 0xfb, 0xf5, 0xcf, 0xb6, - 0xe5, 0xdb, 0x66, 0xdd, 0x4b, 0x89, 0xbe, 0x00, 0xf4, 0x96, 0xf0, 0x9c, 0x64, 0x58, 0xfd, 0x13, - 0xe0, 0xc3, 0x83, 0x03, 0x9c, 0x0b, 0xdd, 0x8a, 0x8b, 0xfe, 0x46, 0x19, 0x51, 0x0e, 0x87, 0x07, - 0x07, 0x67, 0x02, 0xb9, 0xf0, 0x89, 0x79, 0x7e, 0x11, 0xa3, 0x34, 0x95, 0x38, 0x9c, 0x49, 0x22, - 0x74, 0x4f, 0x2e, 0xfa, 0x9b, 0x65, 0xa8, 0xab, 0x23, 0x47, 0x2a, 0x80, 0x8e, 0xa1, 0x63, 0xf8, - 0x9f, 0x19, 0x7f, 0x9b, 0xe6, 0x09, 0x16, 0x44, 0xe2, 0x82, 0xa7, 0xd3, 0x40, 0x12, 0xb3, 0x78, - 0x49, 0x2f, 0xfe, 0xac, 0xe4, 0xde, 0x94, 0xd8, 0x88, 0xc8, 0x61, 0x09, 0x95, 0x3e, 0x3d, 0x68, - 0x3f, 0xe0, 0xa3, 0x6f, 0x36, 0x36, 0x36, 0x75, 0x6d, 0xb3, 0x73, 0xdf, 0x66, 0xa4, 0x99, 0xd2, - 0xe5, 0x39, 0x80, 0x69, 0x35, 0x9c, 0xc6, 0xba, 0x29, 0xd7, 0x8e, 0xd6, 0xe6, 0xb7, 0x6d, 0xdb, - 0x94, 0x7d, 0xd0, 0xf3, 0x6d, 0x03, 0x0c, 0x62, 0xf4, 0x14, 0x9a, 0x13, 0x41, 0xf8, 0xbf, 0xca, - 0xd2, 0xd0, 0x9b, 0xac, 0x29, 0xfd, 0x43, 0x51, 0x9e, 0xc0, 0x32, 0xb9, 0x26, 0x91, 0xf2, 0x54, - 0x9d, 0x68, 0x1f, 0xc1, 0xfc, 0xb6, 0x5d, 0xef, 0x5f, 0x93, 0x68, 0xd0, 0xf3, 0xeb, 0x2a, 0x34, - 0x88, 0x8f, 0xe2, 0x9b, 0xf7, 0xad, 0xda, 0xef, 0xef, 0x5b, 0xb5, 0x5f, 0xe6, 0x2d, 0xeb, 0x66, - 0xde, 0xb2, 0x7e, 0x9b, 0xb7, 0xac, 0xbf, 0xe6, 0x2d, 0xeb, 0xc7, 0x6f, 0xff, 0xff, 0xe7, 0xe0, - 0x2b, 0xf3, 0xfb, 0x7d, 0x2d, 0xac, 0xeb, 0x7b, 0xff, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x84, 0x30, 0x9b, 0x7c, 0x65, 0x06, 0x00, 0x00, + // 953 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5d, 0x6f, 0xdb, 0x36, + 0x17, 0xb6, 0xda, 0x24, 0xb6, 0x4e, 0xbe, 0x1c, 0x36, 0x40, 0x85, 0xe4, 0xad, 0x6d, 0xa4, 0x2f, + 0xd0, 0x14, 0x6b, 0xa4, 0xa4, 0xdb, 0xdd, 0x06, 0x0c, 0x8d, 0xed, 0xb4, 0x1e, 0xf2, 0x61, 0xc8, + 0x59, 0xba, 0x8f, 0x0b, 0x42, 0x1f, 0x8c, 0x4c, 0x54, 0x12, 0x05, 0x92, 0xf6, 0xe2, 0x5e, 0xed, + 0x27, 0xec, 0x87, 0xec, 0x87, 0xe4, 0x72, 0x97, 0x03, 0x06, 0x64, 0xab, 0x7f, 0xc9, 0x40, 0x8a, + 0x4a, 0xbb, 0x20, 0xd8, 0xcd, 0xae, 0x4c, 0x3e, 0xcf, 0xc3, 0x87, 0xe7, 0x1c, 0x9d, 0x43, 0xc3, + 0x59, 0x42, 0xe5, 0x78, 0x12, 0xba, 0x11, 0xcb, 0xbc, 0x13, 0x1a, 0x71, 0x26, 0xd8, 0xa5, 0xf4, + 0xc6, 0x91, 0x10, 0x63, 0x9a, 0x79, 0x51, 0x16, 0x7b, 0x11, 0xcb, 0x65, 0x40, 0x73, 0xc2, 0xe3, + 0x3d, 0x85, 0xed, 0xf1, 0x49, 0x3e, 0x8e, 0xc4, 0xde, 0xf4, 0xc0, 0x63, 0x85, 0xa4, 0x2c, 0x17, + 0x5e, 0x89, 0xb8, 0x05, 0x67, 0x92, 0xa1, 0xcd, 0x8f, 0x7a, 0xd7, 0x10, 0xd3, 0x83, 0xad, 0xcd, + 0x84, 0x25, 0x4c, 0x0b, 0x3c, 0xb5, 0x2a, 0xb5, 0x5b, 0xed, 0x84, 0xb1, 0x24, 0x25, 0x9e, 0xde, + 0x85, 0x93, 0x4b, 0x4f, 0xd2, 0x8c, 0x08, 0x19, 0x64, 0x45, 0x29, 0xd8, 0xf9, 0xb5, 0x0e, 0xf5, + 0xb3, 0xf2, 0x16, 0xb4, 0x09, 0x8b, 0x31, 0x09, 0x27, 0x89, 0x63, 0x75, 0xac, 0xdd, 0x86, 0x5f, + 0x6e, 0xd0, 0x11, 0x80, 0x5e, 0x60, 0x39, 0x2b, 0x88, 0xf3, 0xa0, 0x63, 0xed, 0xae, 0xbd, 0x7c, + 0xe6, 0xde, 0x17, 0x83, 0x6b, 0x8c, 0xdc, 0x9e, 0xd2, 0x9f, 0xcf, 0x0a, 0xe2, 0xdb, 0x71, 0xb5, + 0x44, 0x4f, 0x61, 0x95, 0x93, 0x84, 0x0a, 0xc9, 0x67, 0x98, 0x33, 0x26, 0x9d, 0x87, 0x1d, 0x6b, + 0xd7, 0xf6, 0x57, 0x2a, 0xd0, 0x67, 0x4c, 0x2a, 0x91, 0x08, 0xf2, 0x38, 0x64, 0x57, 0x98, 0x66, + 0x41, 0x42, 0x9c, 0x85, 0x52, 0x64, 0xc0, 0x81, 0xc2, 0xd0, 0x73, 0x68, 0x56, 0xa2, 0x22, 0x0d, + 0xe4, 0x25, 0xe3, 0x99, 0xb3, 0xa8, 0x75, 0xeb, 0x06, 0x1f, 0x1a, 0x18, 0xfd, 0x08, 0x1b, 0xb7, + 0x7e, 0x82, 0xa5, 0x81, 0x8a, 0xcf, 0x59, 0xd2, 0x39, 0xb8, 0xff, 0x9e, 0xc3, 0xc8, 0xdc, 0x58, + 0x9d, 0xf2, 0xab, 0x3b, 0x6f, 0x11, 0xe4, 0xc1, 0x66, 0xc8, 0x98, 0xc4, 0x97, 0x34, 0x25, 0x42, + 0xe7, 0x84, 0x8b, 0x40, 0x8e, 0x9d, 0xba, 0x8e, 0x65, 0x43, 0x71, 0x47, 0x8a, 0x52, 0x99, 0x0d, + 0x03, 0x39, 0x46, 0x2f, 0x00, 0x4d, 0x33, 0x5c, 0x70, 0x16, 0x11, 0x21, 0x18, 0xc7, 0x11, 0x9b, + 0xe4, 0xd2, 0x69, 0x74, 0xac, 0xdd, 0x45, 0xbf, 0x39, 0xcd, 0x86, 0x15, 0xd1, 0x55, 0x38, 0x72, + 0x61, 0x73, 0x9a, 0xe1, 0x8c, 0x64, 0x8c, 0xcf, 0xb0, 0xa0, 0xef, 0x09, 0xa6, 0x39, 0xce, 0x42, + 0xc7, 0xae, 0xf4, 0x27, 0x9a, 0x1a, 0xd1, 0xf7, 0x64, 0x90, 0x9f, 0x84, 0xa8, 0x05, 0xf0, 0x7a, + 0xf8, 0xed, 0xc5, 0x9b, 0x9e, 0xba, 0xcb, 0x01, 0x1d, 0xc4, 0x27, 0x08, 0xfa, 0x0a, 0xb6, 0x45, + 0x14, 0xa4, 0x04, 0x47, 0xc5, 0x04, 0xa7, 0x34, 0xa3, 0x52, 0x60, 0xc9, 0xb0, 0x49, 0xcb, 0x59, + 0xd6, 0x1f, 0xfd, 0xb1, 0x96, 0x74, 0x8b, 0xc9, 0xb1, 0x16, 0x9c, 0x33, 0x53, 0x07, 0x74, 0x02, + 0xff, 0x8f, 0xc9, 0x65, 0x30, 0x49, 0x25, 0xbe, 0xad, 0x1b, 0x16, 0x11, 0x0f, 0x64, 0x34, 0xbe, + 0x8d, 0x2e, 0x09, 0x9d, 0x15, 0x1d, 0x5d, 0xdb, 0x68, 0xbb, 0x95, 0x74, 0x54, 0x2a, 0xcb, 0x60, + 0x5f, 0x87, 0xe8, 0x6b, 0x78, 0x52, 0xd9, 0x4d, 0xb3, 0xfb, 0x7c, 0x56, 0xb5, 0x8f, 0x63, 0x44, + 0x17, 0xd9, 0x5d, 0x03, 0xd5, 0x29, 0xe3, 0x80, 0x93, 0xea, 0xac, 0xb3, 0xa6, 0xe3, 0x5f, 0xd1, + 0xa0, 0x11, 0xa3, 0x0e, 0x2c, 0x9f, 0x76, 0x87, 0x9c, 0x5d, 0xcd, 0x5e, 0xc5, 0x31, 0x77, 0xd6, + 0x75, 0x4d, 0x3e, 0x85, 0xd0, 0x36, 0xd8, 0x29, 0x4b, 0x70, 0x4a, 0xa6, 0x24, 0x75, 0x9a, 0x9a, + 0x6f, 0xa4, 0x2c, 0x39, 0x56, 0x7b, 0xf4, 0x05, 0x3c, 0xa6, 0x0c, 0x73, 0xa2, 0x5a, 0x56, 0x0d, + 0x0e, 0x9b, 0x48, 0x15, 0x9d, 0x20, 0x91, 0xb3, 0xa1, 0xc3, 0x7b, 0x44, 0x99, 0xaf, 0xd8, 0xf3, + 0x92, 0x1c, 0xe4, 0x23, 0x12, 0xed, 0x3c, 0x07, 0xfb, 0x76, 0x00, 0x90, 0x0d, 0x8b, 0xa7, 0xc3, + 0xc1, 0xb0, 0xdf, 0xac, 0xa1, 0x06, 0x2c, 0x1c, 0x0d, 0x8e, 0xfb, 0x4d, 0x0b, 0xd5, 0xe1, 0x61, + 0xff, 0xfc, 0x6d, 0xf3, 0xc1, 0x8e, 0x07, 0xcd, 0xbb, 0x7d, 0x86, 0x96, 0xa1, 0x3e, 0xf4, 0xcf, + 0xba, 0xfd, 0xd1, 0xa8, 0x59, 0x43, 0x6b, 0x00, 0x6f, 0xbe, 0x1f, 0xf6, 0xfd, 0x8b, 0xc1, 0xe8, + 0xcc, 0x6f, 0x5a, 0x3b, 0x7f, 0x3c, 0x84, 0x35, 0xd3, 0x26, 0x3d, 0x22, 0x03, 0x9a, 0x0a, 0xf4, + 0x04, 0x40, 0x8f, 0x0a, 0xce, 0x83, 0x8c, 0xe8, 0xd1, 0xb5, 0x7d, 0x5b, 0x23, 0xa7, 0x41, 0x46, + 0x50, 0x17, 0x20, 0xe2, 0x24, 0x90, 0x24, 0xc6, 0x81, 0xd4, 0xe3, 0xbb, 0xfc, 0x72, 0xcb, 0x2d, + 0x9f, 0x05, 0xb7, 0x7a, 0x16, 0xdc, 0xf3, 0xea, 0x59, 0x38, 0x6c, 0x5c, 0xdf, 0xb4, 0x6b, 0xbf, + 0xfc, 0xd9, 0xb6, 0x7c, 0xdb, 0x9c, 0x7b, 0x25, 0xd1, 0x67, 0x80, 0xde, 0x11, 0x9e, 0x93, 0x54, + 0x97, 0x01, 0x1f, 0xec, 0xef, 0xe3, 0x5c, 0xe8, 0x01, 0x5e, 0xf0, 0xd7, 0x4b, 0x46, 0x39, 0x1c, + 0xec, 0xef, 0x9f, 0x0a, 0xe4, 0xc2, 0x23, 0xd3, 0xb4, 0x11, 0xcb, 0x32, 0x2a, 0x71, 0x38, 0x93, + 0x44, 0xe8, 0x49, 0x5e, 0xf0, 0x37, 0x4a, 0xaa, 0xab, 0x99, 0x43, 0x45, 0xa0, 0x23, 0xe8, 0x18, + 0xfd, 0x4f, 0x8c, 0xbf, 0xa3, 0x79, 0x82, 0x05, 0x91, 0xb8, 0xe0, 0x74, 0x1a, 0x48, 0x62, 0x0e, + 0x2f, 0xea, 0xc3, 0xff, 0x2b, 0x75, 0x6f, 0x4b, 0xd9, 0x88, 0xc8, 0x61, 0x29, 0x2a, 0x7d, 0x7a, + 0xd0, 0xbe, 0xc7, 0x47, 0xf7, 0x43, 0x6c, 0x6c, 0x96, 0xb4, 0xcd, 0xf6, 0x5d, 0x9b, 0x91, 0xd6, + 0x94, 0x2e, 0x2f, 0x00, 0xcc, 0x80, 0x62, 0x1a, 0xeb, 0x51, 0x5e, 0x3d, 0x5c, 0x9d, 0xdf, 0xb4, + 0x6d, 0x53, 0xf6, 0x41, 0xcf, 0xb7, 0x8d, 0x60, 0x10, 0xa3, 0x67, 0xd0, 0x9c, 0x08, 0xc2, 0xff, + 0x51, 0x96, 0x86, 0xbe, 0x64, 0x55, 0xe1, 0x1f, 0x8b, 0xf2, 0x14, 0xea, 0xe4, 0x8a, 0x44, 0xca, + 0x53, 0xcd, 0xaf, 0x7d, 0x08, 0xf3, 0x9b, 0xf6, 0x52, 0xff, 0x8a, 0x44, 0x83, 0x9e, 0xbf, 0xa4, + 0xa8, 0x41, 0x7c, 0x18, 0x5f, 0x7f, 0x68, 0xd5, 0x7e, 0xff, 0xd0, 0xaa, 0xfd, 0x3c, 0x6f, 0x59, + 0xd7, 0xf3, 0x96, 0xf5, 0xdb, 0xbc, 0x65, 0xfd, 0x35, 0x6f, 0x59, 0x3f, 0x7c, 0xf3, 0xdf, 0xff, + 0x44, 0xbe, 0x34, 0xbf, 0xdf, 0xd5, 0xc2, 0x25, 0xfd, 0xdd, 0x3f, 0xff, 0x3b, 0x00, 0x00, 0xff, + 0xff, 0x6b, 0x83, 0xa6, 0x5f, 0x9b, 0x06, 0x00, 0x00, } func (m *Options) Marshal() (dAtA []byte, err error) { @@ -418,6 +424,13 @@ func (m *Options) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel))) i += copy(dAtA[i:], m.LogLevel) } + if m.IoRetryTimeoutInSec != 0 { + dAtA[i] = 0x88 + i++ + dAtA[i] = 0x1 + i++ + i = encodeVarintRunhcs(dAtA, i, uint64(m.IoRetryTimeoutInSec)) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -565,6 +578,9 @@ func (m *Options) Size() (n int) { if l > 0 { n += 2 + l + sovRunhcs(uint64(l)) } + if m.IoRetryTimeoutInSec != 0 { + n += 2 + sovRunhcs(uint64(m.IoRetryTimeoutInSec)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -645,6 +661,7 @@ func (this *Options) String() string { `ShareScratch:` + fmt.Sprintf("%v", this.ShareScratch) + `,`, `NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`, `LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`, + `IoRetryTimeoutInSec:` + fmt.Sprintf("%v", this.IoRetryTimeoutInSec) + `,`, `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, `}`, }, "") @@ -1104,6 +1121,25 @@ func (m *Options) Unmarshal(dAtA []byte) error { } m.LogLevel = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 17: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IoRetryTimeoutInSec", wireType) + } + m.IoRetryTimeoutInSec = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRunhcs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.IoRetryTimeoutInSec |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipRunhcs(dAtA[iNdEx:]) diff --git a/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto index 90f3376ff..60c89adbd 100644 --- a/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto +++ b/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto @@ -93,6 +93,11 @@ message Options { // logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override // the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent. string log_level = 16; + + // io_retry_timeout_in_sec is the timeout in seconds for how long to try and reconnect to an upstream IO provider if a connection is lost. + // The typical example is if Containerd has restarted but is expected to come back online. A 0 for this field is interpreted as an infinite + // timeout. + int32 io_retry_timeout_in_sec = 17; } // ProcessDetails contains additional information about a process. This is the additional diff --git a/vendor/github.com/Microsoft/hcsshim/go.mod b/vendor/github.com/Microsoft/hcsshim/go.mod index 4d26c7c36..7c9747667 100644 --- a/vendor/github.com/Microsoft/hcsshim/go.mod +++ b/vendor/github.com/Microsoft/hcsshim/go.mod @@ -5,11 +5,12 @@ go 1.13 require ( github.com/BurntSushi/toml v0.3.1 github.com/Microsoft/go-winio v0.4.17 + github.com/cenkalti/backoff/v4 v4.1.1 github.com/containerd/cgroups v1.0.1 github.com/containerd/console v1.0.2 github.com/containerd/containerd v1.5.7 github.com/containerd/go-runc v1.0.0 - github.com/containerd/ttrpc v1.0.2 + github.com/containerd/ttrpc v1.1.0 github.com/containerd/typeurl v1.0.2 github.com/gogo/protobuf v1.3.2 github.com/golang/mock v1.6.0 diff --git a/vendor/github.com/Microsoft/hcsshim/go.sum b/vendor/github.com/Microsoft/hcsshim/go.sum index 572931b3b..7c383806d 100644 --- a/vendor/github.com/Microsoft/hcsshim/go.sum +++ b/vendor/github.com/Microsoft/hcsshim/go.sum @@ -86,6 +86,8 @@ github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= +github.com/cenkalti/backoff/v4 v4.1.1 h1:G2HAfAmvm/GcKan2oOQpBXOd2tT2G57ZnZGWa1PxPBQ= +github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -172,8 +174,9 @@ github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDG github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/ttrpc v1.0.2 h1:2/O3oTZN36q2xRolk0a2WWGgh7/Vf/liElg5hFYLX9U= github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= +github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI= +github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= @@ -904,8 +907,9 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/vendor/modules.txt b/vendor/modules.txt index 6c97d3a4a..9f024b921 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -11,7 +11,7 @@ github.com/Microsoft/go-winio/pkg/fs github.com/Microsoft/go-winio/pkg/guid github.com/Microsoft/go-winio/pkg/security github.com/Microsoft/go-winio/vhd -# github.com/Microsoft/hcsshim v0.9.0 +# github.com/Microsoft/hcsshim v0.9.1 ## explicit github.com/Microsoft/hcsshim github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options