Update containerd to fix panic caused by race condition.
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
10
vendor/github.com/containerd/containerd/namespaces/ttrpc.go
generated
vendored
10
vendor/github.com/containerd/containerd/namespaces/ttrpc.go
generated
vendored
@@ -27,10 +27,20 @@ const (
|
||||
TTRPCHeader = "containerd-namespace-ttrpc"
|
||||
)
|
||||
|
||||
func copyMetadata(src ttrpc.MD) ttrpc.MD {
|
||||
md := ttrpc.MD{}
|
||||
for k, v := range src {
|
||||
md[k] = append(md[k], v...)
|
||||
}
|
||||
return md
|
||||
}
|
||||
|
||||
func withTTRPCNamespaceHeader(ctx context.Context, namespace string) context.Context {
|
||||
md, ok := ttrpc.GetMetadata(ctx)
|
||||
if !ok {
|
||||
md = ttrpc.MD{}
|
||||
} else {
|
||||
md = copyMetadata(md)
|
||||
}
|
||||
md.Set(TTRPCHeader, namespace)
|
||||
return ttrpc.WithMetadata(ctx, md)
|
||||
|
||||
3
vendor/github.com/containerd/containerd/oci/spec_opts_linux.go
generated
vendored
3
vendor/github.com/containerd/containerd/oci/spec_opts_linux.go
generated
vendored
@@ -32,7 +32,8 @@ func deviceFromPath(path, permissions string) (*specs.LinuxDevice, error) {
|
||||
}
|
||||
|
||||
var (
|
||||
devNumber = stat.Rdev
|
||||
// The type is 32bit on mips.
|
||||
devNumber = uint64(stat.Rdev) // nolint: unconvert
|
||||
major = unix.Major(devNumber)
|
||||
minor = unix.Minor(devNumber)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user