Update containerd to fix panic caused by race condition.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2019-08-10 10:40:43 -07:00
parent fd6c732cd7
commit 7f330dc4aa
3 changed files with 13 additions and 2 deletions

View File

@@ -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)

View File

@@ -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)
)