From a135e1093d5b74f7346c151a7200b85b24528df2 Mon Sep 17 00:00:00 2001 From: boucher Date: Tue, 7 Jun 2016 16:25:54 -0400 Subject: [PATCH] Support the new --empty-ns flags in RunC for checkpoint/restore. Signed-off-by: Ross Boucher --- api/grpc/server/server.go | 1 + api/grpc/types/api.pb.go | 310 +++++++++++++++++++------------------ api/grpc/types/api.proto | 1 + containerd-shim/process.go | 6 + ctr/checkpoint.go | 27 ++-- runtime/container.go | 3 + runtime/runtime.go | 2 + 7 files changed, 188 insertions(+), 162 deletions(-) diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go index d43d5a7..0632374 100644 --- a/api/grpc/server/server.go +++ b/api/grpc/server/server.go @@ -85,6 +85,7 @@ func (s *apiServer) CreateCheckpoint(ctx context.Context, r *types.CreateCheckpo TCP: r.Checkpoint.Tcp, UnixSockets: r.Checkpoint.UnixSockets, Shell: r.Checkpoint.Shell, + EmptyNS: r.Checkpoint.EmptyNS, } s.sv.SendTask(e) diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go index 2013db1..9b242d5 100644 --- a/api/grpc/types/api.pb.go +++ b/api/grpc/types/api.pb.go @@ -71,7 +71,9 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -const _ = proto.ProtoPackageIsVersion1 +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion1 // please upgrade the proto package type GetServerVersionRequest struct { } @@ -291,11 +293,12 @@ func (*ListCheckpointRequest) ProtoMessage() {} func (*ListCheckpointRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } type Checkpoint struct { - Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` - Exit bool `protobuf:"varint,2,opt,name=exit" json:"exit,omitempty"` - Tcp bool `protobuf:"varint,3,opt,name=tcp" json:"tcp,omitempty"` - UnixSockets bool `protobuf:"varint,4,opt,name=unixSockets" json:"unixSockets,omitempty"` - Shell bool `protobuf:"varint,5,opt,name=shell" json:"shell,omitempty"` + Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` + Exit bool `protobuf:"varint,2,opt,name=exit" json:"exit,omitempty"` + Tcp bool `protobuf:"varint,3,opt,name=tcp" json:"tcp,omitempty"` + UnixSockets bool `protobuf:"varint,4,opt,name=unixSockets" json:"unixSockets,omitempty"` + Shell bool `protobuf:"varint,5,opt,name=shell" json:"shell,omitempty"` + EmptyNS []string `protobuf:"bytes,6,rep,name=emptyNS" json:"emptyNS,omitempty"` } func (m *Checkpoint) Reset() { *m = Checkpoint{} } @@ -1315,152 +1318,153 @@ var _API_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 2348 bytes of a gzipped FileDescriptorProto + // 2366 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x59, 0x4b, 0x73, 0x1c, 0x49, - 0x11, 0xf6, 0x3c, 0xa5, 0xc9, 0x79, 0x48, 0xea, 0xd5, 0x63, 0x3c, 0xbb, 0xf6, 0x9a, 0x8e, 0x05, - 0x0c, 0x2c, 0xc2, 0x8c, 0x77, 0x03, 0x07, 0x44, 0x10, 0x61, 0x4b, 0x66, 0x31, 0x6b, 0x2d, 0xe3, - 0x96, 0xc4, 0x1e, 0x27, 0x5a, 0xdd, 0xe5, 0x99, 0x46, 0x33, 0xdd, 0xbd, 0xdd, 0x35, 0xd2, 0xe8, - 0xc2, 0x81, 0x03, 0xdc, 0xf8, 0x03, 0x10, 0x5c, 0xb8, 0x71, 0xe7, 0xc0, 0x2f, 0x20, 0x82, 0x1f, - 0xc2, 0x8d, 0x3b, 0x47, 0xb2, 0xaa, 0xb2, 0xab, 0xab, 0xe7, 0x21, 0x99, 0x03, 0xc1, 0x85, 0xcb, - 0x44, 0xd5, 0x57, 0x59, 0x99, 0x59, 0xf9, 0xaa, 0xec, 0x1a, 0x68, 0xb8, 0x71, 0x70, 0x18, 0x27, - 0x11, 0x8f, 0xac, 0x1a, 0xbf, 0x89, 0x59, 0x6a, 0xdf, 0x87, 0x83, 0xcf, 0x18, 0x3f, 0x65, 0xc9, - 0x15, 0x4b, 0x7e, 0xc1, 0x92, 0x34, 0x88, 0x42, 0x87, 0x7d, 0x35, 0x63, 0x29, 0xb7, 0xe7, 0xd0, - 0x5d, 0x5e, 0x4a, 0xe3, 0x28, 0x4c, 0x99, 0xb5, 0x0b, 0xb5, 0xa9, 0xfb, 0xcb, 0x28, 0xe9, 0x96, - 0x1e, 0x95, 0x1e, 0xb7, 0x1d, 0x35, 0x91, 0x68, 0x10, 0x22, 0x5a, 0x26, 0x54, 0x4c, 0x04, 0x1a, - 0xbb, 0xdc, 0x1b, 0x77, 0x2b, 0x0a, 0x95, 0x13, 0xab, 0x07, 0x9b, 0x09, 0xbb, 0x0a, 0x04, 0xd7, - 0x6e, 0x15, 0x17, 0x1a, 0x8e, 0x9e, 0xdb, 0xbf, 0x29, 0xc1, 0xee, 0x79, 0xec, 0xbb, 0x9c, 0x0d, - 0x92, 0xc8, 0x63, 0x69, 0x4a, 0x2a, 0x59, 0x1d, 0x28, 0x07, 0xbe, 0x94, 0xd9, 0x70, 0x70, 0x64, - 0x6d, 0x43, 0x25, 0x46, 0xa0, 0x2c, 0x01, 0x31, 0xb4, 0x1e, 0x02, 0x78, 0x93, 0x28, 0x65, 0xa7, - 0xdc, 0x0f, 0x42, 0x29, 0x71, 0xd3, 0x31, 0x10, 0xa1, 0xcc, 0x75, 0xe0, 0xf3, 0xb1, 0x94, 0x89, - 0xca, 0xc8, 0x89, 0xb5, 0x0f, 0xf5, 0x31, 0x0b, 0x46, 0x63, 0xde, 0xad, 0x49, 0x98, 0x66, 0xf6, - 0x01, 0xec, 0x2d, 0xe8, 0xa1, 0xce, 0x6f, 0xff, 0xbd, 0x0c, 0xfb, 0x47, 0x09, 0xc3, 0x95, 0xa3, - 0x28, 0xe4, 0x6e, 0x10, 0xb2, 0x64, 0x9d, 0x8e, 0xa8, 0xd1, 0xc5, 0x2c, 0xf4, 0x27, 0x6c, 0xe0, - 0xa2, 0x58, 0xa5, 0xaa, 0x81, 0x48, 0x8d, 0xc7, 0xcc, 0xbb, 0x8c, 0xa3, 0x20, 0xe4, 0x52, 0x63, - 0x5c, 0xcf, 0x11, 0xa1, 0x71, 0x2a, 0x0f, 0xa3, 0xac, 0xa4, 0x26, 0x42, 0x63, 0x1c, 0x44, 0x33, - 0xa5, 0x71, 0xc3, 0xa1, 0x19, 0xe1, 0x2c, 0x49, 0xba, 0x75, 0x8d, 0xe3, 0x4c, 0xe0, 0x13, 0xf7, - 0x82, 0x4d, 0xd2, 0xee, 0xc6, 0xa3, 0x8a, 0xc0, 0xd5, 0xcc, 0x7a, 0x04, 0xcd, 0x30, 0x1a, 0x04, - 0x57, 0x11, 0x77, 0xa2, 0x88, 0x77, 0x37, 0xa5, 0xc1, 0x4c, 0xc8, 0xea, 0xc2, 0x46, 0x32, 0x0b, - 0x79, 0x30, 0x65, 0xdd, 0x86, 0x64, 0x99, 0x4d, 0xc5, 0x5e, 0x1a, 0x3e, 0x4f, 0x46, 0x69, 0x17, - 0x24, 0x63, 0x13, 0xb2, 0x3e, 0x82, 0x76, 0x7e, 0x92, 0xe3, 0x20, 0xe9, 0x36, 0x25, 0x87, 0x22, - 0x68, 0xbf, 0x82, 0x83, 0x25, 0x5b, 0x52, 0x9c, 0x1d, 0x42, 0xc3, 0xcb, 0x40, 0x69, 0xd3, 0x66, - 0x7f, 0xfb, 0x50, 0x46, 0xee, 0x61, 0x4e, 0x9c, 0x93, 0x20, 0xab, 0xf6, 0x69, 0x30, 0x0a, 0xdd, - 0xc9, 0xbb, 0x47, 0x8c, 0xb0, 0x98, 0xdc, 0x42, 0xf1, 0x49, 0x33, 0x7b, 0x1b, 0x3a, 0x19, 0x2b, - 0x72, 0xfa, 0x5f, 0x2a, 0xb0, 0xf3, 0xdc, 0xf7, 0xef, 0x88, 0x49, 0x0c, 0x6c, 0xce, 0x12, 0x0c, - 0x7d, 0xe4, 0x58, 0x96, 0xe6, 0xd4, 0x73, 0xeb, 0x43, 0xa8, 0xce, 0x52, 0x3c, 0x49, 0x45, 0x9e, - 0xa4, 0x49, 0x27, 0x39, 0x47, 0xc8, 0x91, 0x0b, 0x96, 0x05, 0x55, 0x57, 0xd8, 0xb2, 0x2a, 0x6d, - 0x29, 0xc7, 0x42, 0x65, 0x16, 0x5e, 0xa1, 0x9f, 0x05, 0x24, 0x86, 0x02, 0xf1, 0xae, 0x7d, 0xf2, - 0xb0, 0x18, 0x66, 0xc7, 0xda, 0xc8, 0x8f, 0xa5, 0xc3, 0x66, 0x73, 0x75, 0xd8, 0x34, 0xd6, 0x84, - 0x0d, 0x14, 0xc2, 0xc6, 0x86, 0x96, 0xe7, 0xc6, 0xee, 0x45, 0x30, 0x09, 0x78, 0xc0, 0x52, 0xf4, - 0x9f, 0x50, 0xa2, 0x80, 0x59, 0x8f, 0x61, 0xcb, 0x8d, 0x63, 0x37, 0x99, 0x46, 0x09, 0x9a, 0xe6, - 0x6d, 0x30, 0x61, 0xdd, 0x96, 0x64, 0xb2, 0x08, 0x0b, 0x6e, 0x29, 0x9b, 0x04, 0xe1, 0x6c, 0xfe, - 0x5a, 0x44, 0x5f, 0xb7, 0x2d, 0xc9, 0x0a, 0x98, 0xe0, 0x16, 0x46, 0x5f, 0xb0, 0xeb, 0x41, 0x12, - 0x5c, 0xe1, 0x9e, 0x11, 0x0a, 0xed, 0x48, 0x2b, 0x2e, 0xc2, 0xd6, 0x37, 0x31, 0x30, 0x27, 0xc1, - 0x34, 0xe0, 0x69, 0x77, 0x0b, 0xd5, 0x6a, 0xf6, 0xdb, 0x64, 0x4f, 0x47, 0xa2, 0x4e, 0xb6, 0x6a, - 0x1f, 0x43, 0x5d, 0x41, 0xc2, 0xbc, 0x82, 0x84, 0xbc, 0x25, 0xc7, 0x02, 0x4b, 0xa3, 0xb7, 0x5c, - 0xfa, 0xaa, 0xea, 0xc8, 0xb1, 0xc0, 0xc6, 0x6e, 0xe2, 0x4b, 0x3f, 0x21, 0x26, 0xc6, 0xb6, 0x03, - 0x55, 0xe1, 0x28, 0x61, 0xea, 0x19, 0x39, 0xbc, 0xed, 0x88, 0xa1, 0x40, 0x46, 0x14, 0x53, 0x88, - 0xe0, 0xd0, 0xfa, 0x06, 0x74, 0x5c, 0xdf, 0x47, 0xf3, 0x44, 0xe8, 0xf5, 0xcf, 0x02, 0x3f, 0x45, - 0x4e, 0x15, 0x5c, 0x5c, 0x40, 0xed, 0x5d, 0xb0, 0xcc, 0x80, 0xa2, 0x38, 0xfb, 0x75, 0x49, 0x27, - 0x84, 0xce, 0x93, 0x75, 0xd1, 0xf6, 0xfd, 0x42, 0xf5, 0x28, 0xcb, 0xb8, 0xda, 0xc9, 0x32, 0x24, - 0xdf, 0x6d, 0x16, 0x94, 0xa5, 0xa4, 0xac, 0xac, 0x4a, 0xca, 0x1e, 0x74, 0x97, 0x75, 0x20, 0x05, - 0x3d, 0x38, 0x38, 0x66, 0x13, 0xf6, 0x2e, 0xfa, 0xa1, 0x25, 0x43, 0x17, 0x4b, 0x87, 0x4a, 0x38, - 0x39, 0x7e, 0x77, 0x05, 0x96, 0x85, 0x90, 0x02, 0x27, 0xb0, 0xf7, 0x3a, 0x48, 0xf9, 0xdd, 0xe2, - 0x97, 0x44, 0x95, 0x57, 0x89, 0xfa, 0x15, 0x40, 0xce, 0x4a, 0xab, 0x5c, 0x32, 0x54, 0x46, 0x8c, - 0xcd, 0x03, 0x4e, 0x09, 0x2d, 0xc7, 0xc2, 0xed, 0xdc, 0x8b, 0xe9, 0x8e, 0x11, 0x43, 0x51, 0x10, - 0x67, 0x61, 0x30, 0x3f, 0x8d, 0xbc, 0x4b, 0xc6, 0x53, 0x59, 0xb0, 0xb1, 0x98, 0x1a, 0x90, 0xcc, - 0xca, 0x31, 0x9b, 0x4c, 0x64, 0xd5, 0xde, 0x74, 0xd4, 0x04, 0x8f, 0xb3, 0xbf, 0x78, 0x1c, 0xaa, - 0x7f, 0x4f, 0xa1, 0x99, 0xab, 0x9a, 0xa2, 0x4a, 0x95, 0xd5, 0xfe, 0x35, 0xa9, 0xec, 0x87, 0xd0, - 0x3a, 0xe5, 0xe8, 0xb9, 0x35, 0x46, 0xb1, 0x1f, 0x43, 0x47, 0x17, 0x4f, 0x49, 0xa8, 0xd2, 0xdf, - 0xe5, 0xb3, 0x94, 0xa8, 0x68, 0x66, 0xff, 0xb5, 0x02, 0x1b, 0x14, 0x9d, 0x59, 0x89, 0x29, 0xe5, - 0x25, 0xe6, 0x7f, 0x52, 0xe9, 0x3e, 0x80, 0x46, 0x7a, 0x93, 0x72, 0x36, 0x1d, 0x50, 0xbd, 0x6b, - 0x3b, 0x39, 0xf0, 0xff, 0xaa, 0x97, 0x57, 0xbd, 0xbf, 0x95, 0xa0, 0xa1, 0xdd, 0xfc, 0x1f, 0x77, - 0x25, 0x1f, 0x43, 0x23, 0x56, 0x8e, 0x67, 0xaa, 0x78, 0x35, 0xfb, 0x1d, 0x12, 0x94, 0x95, 0xab, - 0x9c, 0xc0, 0x88, 0x9f, 0xaa, 0x19, 0x3f, 0x46, 0xd7, 0x51, 0x2b, 0x74, 0x1d, 0xe8, 0xfc, 0x58, - 0x54, 0xc5, 0xba, 0xac, 0x8a, 0x72, 0x6c, 0xf6, 0x19, 0x1b, 0x85, 0x3e, 0xc3, 0xfe, 0x14, 0x36, - 0x4e, 0x5c, 0x6f, 0x8c, 0xe7, 0x10, 0x1b, 0xbd, 0x98, 0xc2, 0x14, 0x37, 0x8a, 0xb1, 0x10, 0x32, - 0x65, 0x68, 0xef, 0x1b, 0x2a, 0xe1, 0x34, 0xb3, 0x2f, 0xb1, 0x17, 0x50, 0x69, 0x40, 0xc9, 0xf4, - 0x04, 0x6b, 0x65, 0x66, 0x90, 0x2c, 0x97, 0x96, 0xbb, 0x09, 0x83, 0x06, 0xdd, 0xb2, 0x31, 0x55, - 0x92, 0xa9, 0xb4, 0x66, 0x36, 0x20, 0x7d, 0x9c, 0x6c, 0xd9, 0xfe, 0x6d, 0x09, 0xf6, 0x55, 0xab, - 0x78, 0x67, 0x43, 0xb8, 0xba, 0x05, 0x51, 0xe6, 0xab, 0x14, 0xcc, 0xf7, 0x14, 0x1a, 0x09, 0x4b, - 0xa3, 0x59, 0x82, 0x66, 0x96, 0x96, 0x6d, 0xf6, 0xf7, 0xb2, 0x4c, 0x92, 0xb2, 0x1c, 0x5a, 0x75, - 0x72, 0x3a, 0xfb, 0x0f, 0x15, 0xe8, 0x14, 0x57, 0x45, 0x5d, 0xba, 0x98, 0x5c, 0x06, 0xd1, 0x97, - 0xaa, 0xc7, 0x55, 0xc6, 0x33, 0x21, 0x91, 0x55, 0x68, 0xcb, 0x53, 0xbc, 0xe8, 0x50, 0x92, 0xba, - 0xc8, 0x72, 0x80, 0x56, 0x07, 0x2c, 0x09, 0x22, 0x9f, 0xba, 0xa4, 0x1c, 0x10, 0x65, 0x00, 0x27, - 0x6f, 0x66, 0x11, 0x77, 0xa9, 0xab, 0xd6, 0x73, 0xd9, 0xdc, 0xa2, 0x8f, 0x18, 0x3f, 0x12, 0x5e, - 0xab, 0x51, 0x73, 0xab, 0x91, 0x7c, 0xfd, 0x84, 0x4d, 0x53, 0x4a, 0x73, 0x03, 0x11, 0x9a, 0x2b, - 0x6f, 0xbe, 0x16, 0x41, 0x4d, 0xf9, 0x6e, 0x42, 0x82, 0x83, 0x9a, 0x9e, 0x5e, 0xbb, 0xb1, 0x4c, - 0xfb, 0xb6, 0x63, 0x20, 0x18, 0xc8, 0x3b, 0x6a, 0x86, 0xd6, 0xc0, 0x4f, 0x19, 0x57, 0xdc, 0xbe, - 0xb2, 0x0c, 0xb4, 0x9d, 0xe5, 0x05, 0x41, 0x7d, 0xc9, 0x92, 0x90, 0x4d, 0x4e, 0x0c, 0xa9, 0xa0, - 0xa8, 0x97, 0x16, 0xac, 0x3e, 0xec, 0x2a, 0xf0, 0xec, 0x68, 0x60, 0x6e, 0x68, 0xca, 0x0d, 0x2b, - 0xd7, 0xc4, 0x07, 0xd7, 0x52, 0x9c, 0xd0, 0xad, 0xf6, 0x5d, 0x68, 0xbf, 0xbc, 0x62, 0x58, 0xc1, - 0xb3, 0xc8, 0x41, 0xbb, 0x8b, 0x04, 0xc0, 0x68, 0x98, 0xc6, 0xd2, 0x6b, 0x55, 0x27, 0x07, 0xec, - 0x14, 0x6a, 0x92, 0x7c, 0x65, 0x57, 0xa3, 0x82, 0xae, 0xac, 0x83, 0xae, 0x18, 0x62, 0x6d, 0x1d, - 0x62, 0x14, 0x8c, 0xd5, 0x3c, 0x18, 0x0b, 0x42, 0x6b, 0x8b, 0x42, 0x7f, 0x57, 0x86, 0xd6, 0x17, - 0x8c, 0x5f, 0x47, 0xc9, 0xa5, 0x48, 0xae, 0x74, 0xe5, 0x6d, 0x79, 0x1f, 0xbf, 0xed, 0xe6, 0xc3, - 0x8b, 0x1b, 0x4e, 0xc1, 0x54, 0xc5, 0x5c, 0x9e, 0xbf, 0x10, 0x53, 0xeb, 0x01, 0x00, 0x2e, 0x0d, - 0x5c, 0x75, 0x43, 0xaa, 0xfe, 0xaa, 0x91, 0xcc, 0x09, 0xb0, 0xde, 0x87, 0x86, 0x33, 0x1f, 0x62, - 0x0d, 0x8e, 0x12, 0x15, 0xf1, 0x55, 0xfc, 0x2c, 0x9c, 0xbf, 0x94, 0x73, 0xb1, 0x17, 0x17, 0xfd, - 0x24, 0x8a, 0x63, 0xe6, 0x67, 0xaa, 0x25, 0xf3, 0x63, 0x05, 0x08, 0xa9, 0x67, 0x99, 0xd4, 0xba, - 0x92, 0xca, 0x73, 0xa9, 0xb8, 0x14, 0x93, 0xd4, 0x0d, 0x3a, 0x94, 0x29, 0xf5, 0x4c, 0x4b, 0xdd, - 0x54, 0x52, 0xb9, 0x21, 0xf5, 0x2c, 0x97, 0xda, 0xc8, 0xf6, 0x92, 0x54, 0xfb, 0xcf, 0x25, 0xd8, - 0xc4, 0x50, 0x3e, 0x4f, 0xdd, 0x11, 0xc3, 0x5b, 0xaf, 0xc9, 0x31, 0xec, 0x27, 0xc3, 0x99, 0x98, - 0x92, 0xcb, 0x40, 0x42, 0x8a, 0xe0, 0x6b, 0xd0, 0x8a, 0x59, 0x82, 0x01, 0x4e, 0x14, 0x65, 0x2c, - 0x42, 0x55, 0xa7, 0xa9, 0x30, 0x45, 0x72, 0x08, 0xef, 0xc9, 0xb5, 0x61, 0x10, 0x0e, 0x55, 0x04, - 0x4d, 0x23, 0x9f, 0x91, 0xa9, 0x76, 0xe4, 0xd2, 0xab, 0xf0, 0x73, 0xbd, 0x60, 0x7d, 0x1b, 0x76, - 0x34, 0xbd, 0xb8, 0x59, 0x25, 0xb5, 0x32, 0xdd, 0x16, 0x51, 0x9f, 0x13, 0x8c, 0x8d, 0x4e, 0xe7, - 0x6c, 0x8c, 0x9f, 0xff, 0x1c, 0xaf, 0x9e, 0xd1, 0xb1, 0x8b, 0x09, 0x8a, 0x55, 0x37, 0x96, 0x69, - 0x9c, 0x92, 0xb6, 0xd9, 0xd4, 0xfa, 0x0e, 0xec, 0x70, 0x45, 0xcb, 0xfc, 0x61, 0x46, 0xa3, 0xbc, - 0xb9, 0xad, 0x17, 0x06, 0x44, 0xfc, 0x75, 0xe8, 0xe4, 0xc4, 0xb2, 0x86, 0x2b, 0x7d, 0xdb, 0x1a, - 0x3d, 0x13, 0x95, 0xfc, 0xf7, 0xca, 0x58, 0x2a, 0x72, 0x3e, 0x96, 0x55, 0xc5, 0x30, 0x55, 0xb3, - 0xbf, 0x95, 0x55, 0x63, 0x32, 0x86, 0xac, 0x24, 0xca, 0x2c, 0x3f, 0x86, 0x2d, 0xae, 0x55, 0x1f, - 0x62, 0x02, 0xb9, 0x54, 0x92, 0xb3, 0x8a, 0x58, 0x3c, 0x98, 0xd3, 0xe1, 0xc5, 0x83, 0xa2, 0xe5, - 0x55, 0x9b, 0x40, 0x02, 0x95, 0x7e, 0x4d, 0x85, 0x49, 0x11, 0xf6, 0x8f, 0xa0, 0x81, 0x3d, 0x44, - 0xaa, 0xb4, 0x43, 0xc3, 0x78, 0xb3, 0x24, 0xc1, 0xfc, 0xca, 0x0c, 0x43, 0x53, 0xd1, 0x63, 0xc8, - 0x2b, 0x96, 0x8c, 0xa1, 0x26, 0x76, 0x04, 0xa0, 0xd2, 0x5c, 0x4a, 0x43, 0x1a, 0x33, 0x04, 0xd4, - 0x44, 0xc4, 0xd9, 0xd4, 0x9d, 0x6b, 0xd7, 0xcb, 0x38, 0x43, 0x40, 0x1d, 0x10, 0x05, 0xbe, 0x75, - 0x83, 0x89, 0x47, 0x8f, 0x00, 0x28, 0x90, 0xa6, 0xb9, 0xc0, 0xaa, 0x29, 0xf0, 0x4f, 0x65, 0x68, - 0x2a, 0x89, 0x4a, 0x61, 0xa4, 0xf2, 0xf0, 0x32, 0xd2, 0x22, 0xe5, 0x04, 0xdb, 0x85, 0x5a, 0x2e, - 0x2e, 0x6f, 0x1d, 0x73, 0x55, 0x33, 0xdd, 0xf0, 0x72, 0x4c, 0xb1, 0x5e, 0x1a, 0xd6, 0x59, 0x49, - 0xdd, 0x10, 0x44, 0x4a, 0xe1, 0x4f, 0xa0, 0xa5, 0xe2, 0x93, 0xf6, 0x54, 0xd7, 0xed, 0x69, 0x2a, - 0x32, 0xb5, 0xeb, 0xa9, 0xe8, 0xd0, 0x50, 0x5f, 0xd9, 0x11, 0x34, 0xfb, 0x0f, 0x0a, 0xe4, 0xf2, - 0x24, 0x87, 0xf2, 0xf7, 0x65, 0xc8, 0xb1, 0x34, 0x2b, 0xda, 0xde, 0x33, 0x80, 0x1c, 0x14, 0x35, - 0xeb, 0x92, 0xdd, 0x64, 0x9d, 0x28, 0x0e, 0xc5, 0xd9, 0xaf, 0xdc, 0xc9, 0x2c, 0x33, 0xaa, 0x9a, - 0xfc, 0xb0, 0xfc, 0xac, 0x84, 0x9f, 0x2a, 0x5b, 0x2f, 0xc4, 0x3d, 0x67, 0x6c, 0x2f, 0xbc, 0x5d, - 0x55, 0x57, 0xbe, 0x5d, 0x55, 0xb3, 0xb7, 0x2b, 0x2c, 0xa3, 0x51, 0x4c, 0xb7, 0x32, 0x8e, 0x72, - 0x41, 0x55, 0x43, 0x90, 0xfd, 0x8f, 0x2a, 0x40, 0x2e, 0xc5, 0x3a, 0x85, 0x5e, 0x10, 0x0d, 0xc5, - 0xa5, 0x12, 0x78, 0x4c, 0x15, 0xa4, 0x61, 0xc2, 0x30, 0x7c, 0xd2, 0xe0, 0x8a, 0x51, 0xdf, 0xb1, - 0x4f, 0xe7, 0x5e, 0x50, 0xce, 0x39, 0xc0, 0x99, 0xda, 0x28, 0x2b, 0x97, 0x93, 0x6d, 0xb3, 0x7e, - 0x06, 0x7b, 0x39, 0x53, 0xdf, 0xe0, 0x57, 0xbe, 0x95, 0xdf, 0x7b, 0x9a, 0x9f, 0x9f, 0xf3, 0xfa, - 0x09, 0x20, 0x3c, 0xc4, 0x3b, 0x66, 0x56, 0xe0, 0x54, 0xb9, 0x95, 0xd3, 0x4e, 0x10, 0xbd, 0x91, - 0x3b, 0x72, 0x3e, 0x6f, 0xe0, 0xbe, 0x71, 0x50, 0x91, 0xf6, 0x06, 0xb7, 0xea, 0xad, 0xdc, 0xf6, - 0xb5, 0x5e, 0xa2, 0x30, 0xe4, 0x2c, 0x3f, 0x07, 0x5c, 0x19, 0x5e, 0xbb, 0x01, 0x5f, 0xe4, 0x57, - 0xbb, 0xeb, 0x9c, 0x5f, 0xe2, 0xa6, 0x22, 0x33, 0x75, 0xce, 0x29, 0x4b, 0x46, 0x85, 0x73, 0xd6, - 0xef, 0x3a, 0xe7, 0x89, 0xdc, 0x91, 0xf3, 0x79, 0x01, 0x08, 0x2e, 0xea, 0xb3, 0x71, 0x2b, 0x97, - 0xad, 0x20, 0x2a, 0xea, 0x72, 0x04, 0x3b, 0x29, 0xf3, 0x38, 0xde, 0x28, 0x06, 0x8f, 0xcd, 0x5b, - 0x79, 0x6c, 0xd3, 0x06, 0xcd, 0xc4, 0xfe, 0x0a, 0x5a, 0x3f, 0x9d, 0x8d, 0x18, 0x9f, 0x5c, 0xe8, - 0x9c, 0xff, 0x6f, 0x97, 0x99, 0x7f, 0x61, 0x99, 0x39, 0x1a, 0x25, 0xd1, 0x2c, 0x2e, 0x54, 0x6d, - 0x95, 0xc3, 0x4b, 0x55, 0x5b, 0xd2, 0xc8, 0xaa, 0xad, 0xa8, 0x3f, 0x85, 0x96, 0x6a, 0xb2, 0x68, - 0x83, 0xaa, 0x42, 0xd6, 0x72, 0xd2, 0x67, 0x4d, 0x9d, 0xda, 0xd6, 0xa7, 0x86, 0x95, 0x76, 0x15, - 0xab, 0x51, 0x6e, 0x26, 0xfc, 0x62, 0xc9, 0xb3, 0xee, 0x15, 0xb4, 0xc7, 0xca, 0x36, 0xb4, 0x4b, - 0x05, 0xe0, 0x47, 0x99, 0x72, 0xf9, 0x19, 0x0e, 0x4d, 0x1b, 0x2a, 0x53, 0xb7, 0xc6, 0xa6, 0x59, - 0xbf, 0x07, 0x20, 0x3e, 0x49, 0x86, 0x59, 0xa1, 0x32, 0x9f, 0x1d, 0xf5, 0x0d, 0x81, 0xdf, 0x3f, - 0xd9, 0xb0, 0x77, 0x06, 0x3b, 0x4b, 0x3c, 0x57, 0x94, 0xa9, 0x6f, 0x99, 0x65, 0xaa, 0xd9, 0x7f, - 0x8f, 0x58, 0x9a, 0x5b, 0xcd, 0xda, 0xf5, 0xc7, 0x92, 0xfa, 0x82, 0xd1, 0x2f, 0x43, 0xd6, 0x33, - 0x68, 0x87, 0xaa, 0xf9, 0xd2, 0x0e, 0xa8, 0x18, 0x8c, 0xcc, 0xc6, 0xcc, 0x69, 0x85, 0x66, 0x9b, - 0x86, 0x8e, 0xf0, 0xa4, 0x05, 0x56, 0x3a, 0xc2, 0x30, 0x8e, 0xd3, 0xf4, 0x0c, 0x6f, 0x17, 0x9a, - 0xc1, 0xca, 0x62, 0x33, 0x48, 0x0f, 0x0d, 0xeb, 0x9e, 0x42, 0xfb, 0xff, 0xac, 0x43, 0xe5, 0xf9, - 0xe0, 0x95, 0x75, 0x0e, 0xdb, 0x8b, 0xff, 0x24, 0x58, 0x0f, 0x49, 0xf4, 0x9a, 0x7f, 0x1f, 0x7a, - 0x1f, 0xae, 0x5d, 0xa7, 0x6e, 0xf9, 0x9e, 0xe5, 0xc0, 0xd6, 0xc2, 0xbb, 0xb1, 0x95, 0x5d, 0x27, - 0xab, 0xdf, 0xe6, 0x7b, 0x0f, 0xd7, 0x2d, 0x9b, 0x3c, 0x17, 0xda, 0x73, 0xcd, 0x73, 0xf5, 0xe7, - 0x9d, 0xe6, 0xb9, 0xae, 0xab, 0xbf, 0x67, 0xfd, 0x00, 0xea, 0xea, 0x25, 0xd9, 0xda, 0x25, 0xda, - 0xc2, 0x1b, 0x75, 0x6f, 0x6f, 0x01, 0xd5, 0x1b, 0x5f, 0x43, 0xbb, 0xf0, 0xf7, 0x83, 0xf5, 0x7e, - 0x41, 0x56, 0xf1, 0x21, 0xba, 0xf7, 0xc1, 0xea, 0x45, 0xcd, 0xed, 0x08, 0x20, 0x7f, 0x6c, 0xb4, - 0xba, 0x44, 0xbd, 0xf4, 0xa0, 0xdd, 0xbb, 0xbf, 0x62, 0x45, 0x33, 0x41, 0x57, 0x2e, 0x3e, 0x0b, - 0x5a, 0x0b, 0x56, 0x5d, 0x7c, 0x94, 0xd3, 0xae, 0x5c, 0xfb, 0x9e, 0x28, 0xd9, 0x2e, 0x3e, 0xf6, - 0x69, 0xb6, 0x6b, 0x9e, 0x1a, 0x35, 0xdb, 0xb5, 0xaf, 0x84, 0xf7, 0xac, 0x9f, 0x43, 0xa7, 0xf8, - 0xb0, 0x66, 0x65, 0x46, 0x5a, 0xf9, 0x7c, 0xd8, 0x7b, 0xb0, 0x66, 0x55, 0x33, 0xfc, 0x04, 0x6a, - 0xea, 0xc5, 0x2c, 0x4b, 0x39, 0xf3, 0xa1, 0xad, 0xb7, 0x5b, 0x04, 0xf5, 0xae, 0x27, 0x50, 0x57, - 0x1f, 0x76, 0x3a, 0x00, 0x0a, 0xdf, 0x79, 0xbd, 0x96, 0x89, 0xda, 0xf7, 0x9e, 0x94, 0x32, 0x39, - 0x69, 0x41, 0x4e, 0xba, 0x4a, 0x8e, 0xe1, 0x9c, 0x8b, 0xba, 0xfc, 0x6b, 0xef, 0xe9, 0xbf, 0x03, - 0x00, 0x00, 0xff, 0xff, 0x58, 0xa9, 0x0a, 0x41, 0xe7, 0x1b, 0x00, 0x00, + 0xf1, 0xf7, 0x3c, 0xa5, 0xc9, 0x79, 0x48, 0x6a, 0xcb, 0xd2, 0x78, 0x76, 0xed, 0xf5, 0xbf, 0x63, + 0xff, 0x60, 0x60, 0x11, 0x66, 0xbc, 0x1b, 0x38, 0x20, 0x82, 0x08, 0x5b, 0x32, 0x8b, 0x59, 0xcb, + 0x8c, 0x5b, 0x12, 0x7b, 0x9c, 0x68, 0x75, 0x97, 0x67, 0x1a, 0xcd, 0x74, 0xf7, 0x76, 0xd7, 0x48, + 0xa3, 0x0b, 0x07, 0x0e, 0x70, 0xe3, 0x4c, 0x04, 0x04, 0x17, 0x6e, 0xdc, 0x39, 0xf0, 0x09, 0x88, + 0xe0, 0x83, 0x70, 0xe3, 0xce, 0x91, 0xac, 0xaa, 0xec, 0xea, 0xea, 0x79, 0x48, 0xe6, 0x40, 0x70, + 0xe1, 0x32, 0x51, 0xf9, 0xab, 0xac, 0xcc, 0xac, 0xac, 0xcc, 0xac, 0xec, 0x1a, 0x68, 0xb8, 0x71, + 0x70, 0x10, 0x27, 0x11, 0x8f, 0xac, 0x1a, 0xbf, 0x8e, 0x59, 0x6a, 0xdf, 0x87, 0xfd, 0xcf, 0x19, + 0x3f, 0x61, 0xc9, 0x25, 0x4b, 0x7e, 0xc6, 0x92, 0x34, 0x88, 0x42, 0x87, 0x7d, 0x35, 0x63, 0x29, + 0xb7, 0xe7, 0xd0, 0x5d, 0x9e, 0x4a, 0xe3, 0x28, 0x4c, 0x99, 0xb5, 0x0b, 0xb5, 0xa9, 0xfb, 0xf3, + 0x28, 0xe9, 0x96, 0x1e, 0x95, 0x1e, 0xb7, 0x1d, 0x45, 0x48, 0x34, 0x08, 0x11, 0x2d, 0x13, 0x2a, + 0x08, 0x81, 0xc6, 0x2e, 0xf7, 0xc6, 0xdd, 0x8a, 0x42, 0x25, 0x61, 0xf5, 0x60, 0x33, 0x61, 0x97, + 0x81, 0x90, 0xda, 0xad, 0xe2, 0x44, 0xc3, 0xd1, 0xb4, 0xfd, 0xab, 0x12, 0xec, 0x9e, 0xc5, 0xbe, + 0xcb, 0xd9, 0x20, 0x89, 0x3c, 0x96, 0xa6, 0x64, 0x92, 0xd5, 0x81, 0x72, 0xe0, 0x4b, 0x9d, 0x0d, + 0x07, 0x47, 0xd6, 0x36, 0x54, 0x62, 0x04, 0xca, 0x12, 0x10, 0x43, 0xeb, 0x21, 0x80, 0x37, 0x89, + 0x52, 0x76, 0xc2, 0xfd, 0x20, 0x94, 0x1a, 0x37, 0x1d, 0x03, 0x11, 0xc6, 0x5c, 0x05, 0x3e, 0x1f, + 0x4b, 0x9d, 0x68, 0x8c, 0x24, 0xac, 0x3d, 0xa8, 0x8f, 0x59, 0x30, 0x1a, 0xf3, 0x6e, 0x4d, 0xc2, + 0x44, 0xd9, 0xfb, 0x70, 0x6f, 0xc1, 0x0e, 0xb5, 0x7f, 0xfb, 0x6f, 0x65, 0xd8, 0x3b, 0x4c, 0x18, + 0xce, 0x1c, 0x46, 0x21, 0x77, 0x83, 0x90, 0x25, 0xeb, 0x6c, 0x44, 0x8b, 0xce, 0x67, 0xa1, 0x3f, + 0x61, 0x03, 0x17, 0xd5, 0x2a, 0x53, 0x0d, 0x44, 0x5a, 0x3c, 0x66, 0xde, 0x45, 0x1c, 0x05, 0x21, + 0x97, 0x16, 0xe3, 0x7c, 0x8e, 0x08, 0x8b, 0x53, 0xb9, 0x19, 0xe5, 0x25, 0x45, 0x08, 0x8b, 0x71, + 0x10, 0xcd, 0x94, 0xc5, 0x0d, 0x87, 0x28, 0xc2, 0x59, 0x92, 0x74, 0xeb, 0x1a, 0x47, 0x4a, 0xe0, + 0x13, 0xf7, 0x9c, 0x4d, 0xd2, 0xee, 0xc6, 0xa3, 0x8a, 0xc0, 0x15, 0x65, 0x3d, 0x82, 0x66, 0x18, + 0x0d, 0x82, 0xcb, 0x88, 0x3b, 0x51, 0xc4, 0xbb, 0x9b, 0xd2, 0x61, 0x26, 0x64, 0x75, 0x61, 0x23, + 0x99, 0x85, 0x3c, 0x98, 0xb2, 0x6e, 0x43, 0x8a, 0xcc, 0x48, 0xb1, 0x96, 0x86, 0xcf, 0x93, 0x51, + 0xda, 0x05, 0x29, 0xd8, 0x84, 0xac, 0x8f, 0xa1, 0x9d, 0xef, 0xe4, 0x28, 0x48, 0xba, 0x4d, 0x29, + 0xa1, 0x08, 0xda, 0xaf, 0x60, 0x7f, 0xc9, 0x97, 0x14, 0x67, 0x07, 0xd0, 0xf0, 0x32, 0x50, 0xfa, + 0xb4, 0xd9, 0xdf, 0x3e, 0x90, 0x91, 0x7b, 0x90, 0x33, 0xe7, 0x2c, 0x28, 0xaa, 0x7d, 0x12, 0x8c, + 0x42, 0x77, 0xf2, 0xfe, 0x11, 0x23, 0x3c, 0x26, 0x97, 0x50, 0x7c, 0x12, 0x65, 0x6f, 0x43, 0x27, + 0x13, 0x45, 0x87, 0xfe, 0xe7, 0x0a, 0xec, 0x3c, 0xf7, 0xfd, 0x5b, 0x62, 0x12, 0x03, 0x9b, 0xb3, + 0x04, 0x43, 0x1f, 0x25, 0x96, 0xa5, 0x3b, 0x35, 0x6d, 0x7d, 0x04, 0xd5, 0x59, 0x8a, 0x3b, 0xa9, + 0xc8, 0x9d, 0x34, 0x69, 0x27, 0x67, 0x08, 0x39, 0x72, 0xc2, 0xb2, 0xa0, 0xea, 0x0a, 0x5f, 0x56, + 0xa5, 0x2f, 0xe5, 0x58, 0x98, 0xcc, 0xc2, 0x4b, 0x3c, 0x67, 0x01, 0x89, 0xa1, 0x40, 0xbc, 0x2b, + 0x9f, 0x4e, 0x58, 0x0c, 0xb3, 0x6d, 0x6d, 0xe4, 0xdb, 0xd2, 0x61, 0xb3, 0xb9, 0x3a, 0x6c, 0x1a, + 0x6b, 0xc2, 0x06, 0x0a, 0x61, 0x63, 0x43, 0xcb, 0x73, 0x63, 0xf7, 0x3c, 0x98, 0x04, 0x3c, 0x60, + 0x29, 0x9e, 0x9f, 0x30, 0xa2, 0x80, 0x59, 0x8f, 0x61, 0xcb, 0x8d, 0x63, 0x37, 0x99, 0x46, 0x09, + 0xba, 0xe6, 0x5d, 0x30, 0x61, 0xdd, 0x96, 0x14, 0xb2, 0x08, 0x0b, 0x69, 0x29, 0x9b, 0x04, 0xe1, + 0x6c, 0xfe, 0x5a, 0x44, 0x5f, 0xb7, 0x2d, 0xd9, 0x0a, 0x98, 0x90, 0x16, 0x46, 0x6f, 0xd8, 0xd5, + 0x20, 0x09, 0x2e, 0x71, 0xcd, 0x08, 0x95, 0x76, 0xa4, 0x17, 0x17, 0x61, 0xeb, 0xeb, 0x18, 0x98, + 0x93, 0x60, 0x1a, 0xf0, 0xb4, 0xbb, 0x85, 0x66, 0x35, 0xfb, 0x6d, 0xf2, 0xa7, 0x23, 0x51, 0x27, + 0x9b, 0xb5, 0x8f, 0xa0, 0xae, 0x20, 0xe1, 0x5e, 0xc1, 0x42, 0xa7, 0x25, 0xc7, 0x02, 0x4b, 0xa3, + 0x77, 0x5c, 0x9e, 0x55, 0xd5, 0x91, 0x63, 0x81, 0x8d, 0xdd, 0xc4, 0x97, 0xe7, 0x84, 0x98, 0x18, + 0xdb, 0x0e, 0x54, 0xc5, 0x41, 0x09, 0x57, 0xcf, 0xe8, 0xc0, 0xdb, 0x8e, 0x18, 0x0a, 0x64, 0x44, + 0x31, 0x85, 0x08, 0x0e, 0xad, 0xaf, 0x41, 0xc7, 0xf5, 0x7d, 0x74, 0x4f, 0x84, 0xa7, 0xfe, 0x79, + 0xe0, 0xa7, 0x28, 0xa9, 0x82, 0x93, 0x0b, 0xa8, 0xbd, 0x0b, 0x96, 0x19, 0x50, 0x14, 0x67, 0xbf, + 0x2c, 0xe9, 0x84, 0xd0, 0x79, 0xb2, 0x2e, 0xda, 0xbe, 0x5b, 0xa8, 0x1e, 0x65, 0x19, 0x57, 0x3b, + 0x59, 0x86, 0xe4, 0xab, 0xcd, 0x82, 0xb2, 0x94, 0x94, 0x95, 0x55, 0x49, 0xd9, 0x83, 0xee, 0xb2, + 0x0d, 0x64, 0xa0, 0x07, 0xfb, 0x47, 0x6c, 0xc2, 0xde, 0xc7, 0x3e, 0xf4, 0x64, 0xe8, 0x62, 0xe9, + 0x50, 0x09, 0x27, 0xc7, 0xef, 0x6f, 0xc0, 0xb2, 0x12, 0x32, 0xe0, 0x18, 0xee, 0xbd, 0x0e, 0x52, + 0x7e, 0xbb, 0xfa, 0x25, 0x55, 0xe5, 0x55, 0xaa, 0x7e, 0x5b, 0x02, 0xc8, 0x65, 0x69, 0x9b, 0x4b, + 0x86, 0xcd, 0x88, 0xb1, 0x79, 0xc0, 0x29, 0xa3, 0xe5, 0x58, 0x9c, 0x3b, 0xf7, 0x62, 0xba, 0x64, + 0xc4, 0x50, 0x54, 0xc4, 0x59, 0x18, 0xcc, 0x4f, 0x22, 0xef, 0x82, 0xf1, 0x54, 0x56, 0x6c, 0xac, + 0xa6, 0x06, 0x24, 0xd3, 0x72, 0xcc, 0x26, 0x13, 0x59, 0xb6, 0x37, 0x1d, 0x45, 0x88, 0x1a, 0xcb, + 0xa6, 0x31, 0xbf, 0x7e, 0x73, 0x82, 0x49, 0x2d, 0x32, 0x2c, 0x23, 0x71, 0xa7, 0x7b, 0x8b, 0x3b, + 0xa5, 0xd2, 0xf8, 0x14, 0x9a, 0xf9, 0x2e, 0x52, 0x34, 0xb6, 0xb2, 0xfa, 0xe8, 0x4d, 0x2e, 0xfb, + 0x21, 0xb4, 0x4e, 0x38, 0x1e, 0xea, 0x1a, 0x7f, 0xd9, 0x8f, 0xa1, 0xa3, 0xeb, 0xaa, 0x64, 0x54, + 0x95, 0xc1, 0xe5, 0xb3, 0x94, 0xb8, 0x88, 0xb2, 0xff, 0x52, 0x81, 0x0d, 0x0a, 0xdc, 0xac, 0xfa, + 0x94, 0xf2, 0xea, 0xf3, 0x5f, 0x29, 0x82, 0x1f, 0x42, 0x23, 0xbd, 0x4e, 0x39, 0x9b, 0x0e, 0xa8, + 0x14, 0xb6, 0x9d, 0x1c, 0xf8, 0x5f, 0x41, 0xcc, 0x0b, 0xe2, 0x5f, 0x4b, 0xd0, 0xd0, 0xc7, 0xfc, + 0x6f, 0x37, 0x2c, 0x9f, 0x40, 0x23, 0x56, 0x07, 0xcf, 0x54, 0x5d, 0x6b, 0xf6, 0x3b, 0xa4, 0x28, + 0xab, 0x64, 0x39, 0x83, 0x11, 0x3f, 0x55, 0x33, 0x7e, 0x8c, 0x86, 0xa4, 0x56, 0x68, 0x48, 0xf0, + 0xf0, 0x63, 0x51, 0x30, 0xeb, 0xb2, 0x60, 0xca, 0xb1, 0xd9, 0x82, 0x6c, 0x14, 0x5a, 0x10, 0xfb, + 0x33, 0xd8, 0x38, 0x76, 0xbd, 0x31, 0xee, 0x43, 0x2c, 0xf4, 0x62, 0x0a, 0x53, 0x5c, 0x28, 0xc6, + 0x42, 0xc9, 0x94, 0xa1, 0xbf, 0xaf, 0xa9, 0xba, 0x13, 0x65, 0x5f, 0x60, 0x9b, 0xa0, 0xd2, 0x80, + 0x92, 0xe9, 0x09, 0x96, 0xd1, 0xcc, 0x21, 0x59, 0x2e, 0x2d, 0x37, 0x1a, 0x06, 0x0f, 0x1e, 0xcb, + 0xc6, 0x54, 0x69, 0xa6, 0xaa, 0x9b, 0xf9, 0x80, 0xec, 0x71, 0xb2, 0x69, 0xfb, 0xd7, 0x25, 0xd8, + 0x53, 0x5d, 0xe4, 0xad, 0xbd, 0xe2, 0xea, 0xee, 0x44, 0xb9, 0xaf, 0x52, 0x70, 0xdf, 0x53, 0x68, + 0x24, 0x2c, 0x8d, 0x66, 0x09, 0xba, 0x59, 0x7a, 0xb6, 0xd9, 0xbf, 0x97, 0x65, 0x92, 0xd4, 0xe5, + 0xd0, 0xac, 0x93, 0xf3, 0xd9, 0xbf, 0xaf, 0x40, 0xa7, 0x38, 0x2b, 0x2a, 0xd6, 0xf9, 0xe4, 0x22, + 0x88, 0xbe, 0x54, 0xed, 0xaf, 0x72, 0x9e, 0x09, 0x89, 0xac, 0x42, 0x5f, 0x9e, 0xe0, 0x1d, 0x88, + 0x9a, 0xd4, 0x1d, 0x97, 0x03, 0x34, 0x3b, 0x60, 0x49, 0x10, 0xf9, 0xd4, 0x40, 0xe5, 0x80, 0x28, + 0x03, 0x48, 0xbc, 0x9d, 0x45, 0xdc, 0xa5, 0x86, 0x5b, 0xd3, 0xb2, 0xef, 0xc5, 0x33, 0x62, 0xfc, + 0x50, 0x9c, 0x5a, 0x8d, 0xfa, 0x5e, 0x8d, 0xe4, 0xf3, 0xc7, 0x6c, 0x9a, 0x52, 0x9a, 0x1b, 0x88, + 0xb0, 0x5c, 0x9d, 0xe6, 0x6b, 0x11, 0xd4, 0x94, 0xef, 0x26, 0x24, 0x24, 0x28, 0xf2, 0xe4, 0xca, + 0x8d, 0x65, 0xda, 0xb7, 0x1d, 0x03, 0xc1, 0x40, 0xde, 0x51, 0x14, 0x7a, 0x03, 0xbf, 0x72, 0x5c, + 0x71, 0x31, 0xcb, 0x32, 0xd0, 0x76, 0x96, 0x27, 0x04, 0xf7, 0x05, 0x4b, 0x42, 0x36, 0x39, 0x36, + 0xb4, 0x82, 0xe2, 0x5e, 0x9a, 0xb0, 0xfa, 0xb0, 0xab, 0xc0, 0xd3, 0xc3, 0x81, 0xb9, 0xa0, 0x29, + 0x17, 0xac, 0x9c, 0x13, 0xdf, 0x62, 0x4b, 0x71, 0x42, 0x17, 0xde, 0xb7, 0xa1, 0xfd, 0xf2, 0x92, + 0x61, 0x05, 0xcf, 0x22, 0x07, 0xfd, 0x2e, 0x12, 0x00, 0xa3, 0x61, 0x1a, 0xcb, 0x53, 0xab, 0x3a, + 0x39, 0x60, 0xa7, 0x50, 0x93, 0xec, 0x2b, 0x1b, 0x1e, 0x15, 0x74, 0x65, 0x1d, 0x74, 0xc5, 0x10, + 0x6b, 0xeb, 0x10, 0xa3, 0x60, 0xac, 0xe6, 0xc1, 0x58, 0x50, 0x5a, 0x5b, 0x54, 0xfa, 0x9b, 0x32, + 0xb4, 0xde, 0x30, 0x7e, 0x15, 0x25, 0x17, 0x22, 0xb9, 0xd2, 0x95, 0xf7, 0xe8, 0x7d, 0xfc, 0xec, + 0x9b, 0x0f, 0xcf, 0xaf, 0x39, 0x05, 0x53, 0x15, 0x73, 0x79, 0xfe, 0x42, 0x90, 0xd6, 0x03, 0x00, + 0x9c, 0x1a, 0xb8, 0xea, 0xee, 0x54, 0xad, 0x57, 0x23, 0x99, 0x13, 0x60, 0x7d, 0x00, 0x0d, 0x67, + 0x3e, 0xc4, 0x1a, 0x1c, 0x25, 0x2a, 0xe2, 0xab, 0xf8, 0xc5, 0x38, 0x7f, 0x29, 0x69, 0xb1, 0x16, + 0x27, 0xfd, 0x24, 0x8a, 0x63, 0xe6, 0x67, 0xa6, 0x25, 0xf3, 0x23, 0x05, 0x08, 0xad, 0xa7, 0x99, + 0xd6, 0xba, 0xd2, 0xca, 0x73, 0xad, 0x38, 0x15, 0x93, 0xd6, 0x0d, 0xda, 0x94, 0xa9, 0xf5, 0x54, + 0x6b, 0xdd, 0x54, 0x5a, 0xb9, 0xa1, 0xf5, 0x34, 0xd7, 0xda, 0xc8, 0xd6, 0x92, 0x56, 0xfb, 0x4f, + 0x25, 0xd8, 0xc4, 0x50, 0x3e, 0x4b, 0xdd, 0x11, 0xc3, 0x5b, 0xaf, 0xc9, 0x31, 0xec, 0x27, 0xc3, + 0x99, 0x20, 0xe9, 0xc8, 0x40, 0x42, 0x8a, 0xe1, 0xff, 0xa0, 0x15, 0xb3, 0x04, 0x03, 0x9c, 0x38, + 0xca, 0x58, 0x84, 0xaa, 0x4e, 0x53, 0x61, 0x8a, 0xe5, 0x00, 0xee, 0xca, 0xb9, 0x61, 0x10, 0x0e, + 0x55, 0x04, 0x4d, 0x23, 0x9f, 0x91, 0xab, 0x76, 0xe4, 0xd4, 0xab, 0xf0, 0x0b, 0x3d, 0x61, 0x7d, + 0x13, 0x76, 0x34, 0xbf, 0xb8, 0x59, 0x25, 0xb7, 0x72, 0xdd, 0x16, 0x71, 0x9f, 0x11, 0x6c, 0xff, + 0x02, 0x3a, 0xa7, 0xe3, 0x24, 0xe2, 0x1c, 0xaf, 0x9e, 0xd1, 0x91, 0x8b, 0x09, 0x8a, 0x55, 0x37, + 0x96, 0x69, 0x9c, 0x92, 0xb5, 0x19, 0x69, 0x7d, 0x0b, 0x76, 0xb8, 0xe2, 0x65, 0xfe, 0x30, 0xe3, + 0x51, 0xa7, 0xb9, 0xad, 0x27, 0x06, 0xc4, 0xfc, 0xff, 0xd0, 0xc9, 0x99, 0x65, 0x0d, 0x57, 0xf6, + 0xb6, 0x35, 0x7a, 0x2a, 0x2a, 0xf9, 0xef, 0x94, 0xb3, 0x54, 0xe4, 0x7c, 0x22, 0xab, 0x8a, 0xe1, + 0xaa, 0x66, 0x7f, 0x2b, 0xab, 0xc6, 0xe4, 0x0c, 0x59, 0x49, 0x94, 0x5b, 0x7e, 0x08, 0x5b, 0x5c, + 0x9b, 0x3e, 0xc4, 0x04, 0x72, 0xa9, 0x24, 0x67, 0x15, 0xb1, 0xb8, 0x31, 0xa7, 0xc3, 0x8b, 0x1b, + 0x45, 0xcf, 0xab, 0x36, 0x81, 0x14, 0x2a, 0xfb, 0x9a, 0x0a, 0x93, 0x2a, 0xec, 0x1f, 0x40, 0x03, + 0x7b, 0x88, 0x54, 0x59, 0x87, 0x8e, 0xf1, 0x66, 0x49, 0x82, 0xf9, 0x95, 0x39, 0x86, 0x48, 0xd1, + 0x63, 0xc8, 0x2b, 0x96, 0x9c, 0xa1, 0x08, 0x3b, 0x02, 0x50, 0x69, 0x2e, 0xb5, 0x21, 0x8f, 0x19, + 0x02, 0x8a, 0x10, 0x71, 0x36, 0x75, 0xe7, 0xfa, 0xe8, 0x65, 0x9c, 0x21, 0xa0, 0x36, 0x88, 0x0a, + 0xdf, 0xb9, 0xc1, 0xc4, 0xa3, 0xf7, 0x01, 0x54, 0x48, 0x64, 0xae, 0xb0, 0x6a, 0x2a, 0xfc, 0x63, + 0x19, 0x9a, 0x4a, 0xa3, 0x32, 0x18, 0xb9, 0x3c, 0xbc, 0x8c, 0xb4, 0x4a, 0x49, 0x60, 0xbb, 0x50, + 0xcb, 0xd5, 0xe5, 0xad, 0x63, 0x6e, 0x6a, 0x66, 0x1b, 0x5e, 0x8e, 0x29, 0xd6, 0x4b, 0xc3, 0x3b, + 0x2b, 0xb9, 0x1b, 0x82, 0x49, 0x19, 0xfc, 0x29, 0xb4, 0x54, 0x7c, 0xd2, 0x9a, 0xea, 0xba, 0x35, + 0x4d, 0xc5, 0xa6, 0x56, 0x3d, 0x15, 0x1d, 0x1a, 0xda, 0x2b, 0x3b, 0x82, 0x66, 0xff, 0x41, 0x81, + 0x5d, 0xee, 0xe4, 0x40, 0xfe, 0xbe, 0x0c, 0x39, 0x96, 0x66, 0xc5, 0xdb, 0x7b, 0x06, 0x90, 0x83, + 0xa2, 0x66, 0x5d, 0xb0, 0xeb, 0xac, 0x13, 0xc5, 0xa1, 0xd8, 0xfb, 0xa5, 0x3b, 0x99, 0x65, 0x4e, + 0x55, 0xc4, 0xf7, 0xcb, 0xcf, 0x4a, 0xf8, 0x15, 0xb3, 0xf5, 0x42, 0xdc, 0x73, 0xc6, 0xf2, 0xc2, + 0xb3, 0x56, 0x75, 0xe5, 0xb3, 0x56, 0x35, 0x7b, 0xd6, 0xc2, 0x32, 0x1a, 0xc5, 0x74, 0x2b, 0xe3, + 0x28, 0x57, 0x54, 0x35, 0x14, 0xd9, 0x7f, 0xaf, 0x02, 0xe4, 0x5a, 0xac, 0x13, 0xe8, 0x05, 0xd1, + 0x50, 0x5c, 0x2a, 0x81, 0xc7, 0x54, 0x41, 0x1a, 0x26, 0x0c, 0xc3, 0x27, 0x0d, 0x2e, 0x19, 0xf5, + 0x1d, 0x7b, 0xb4, 0xef, 0x05, 0xe3, 0x9c, 0x7d, 0xa4, 0xd4, 0x42, 0x59, 0xb9, 0x9c, 0x6c, 0x99, + 0xf5, 0x13, 0xb8, 0x97, 0x0b, 0xf5, 0x0d, 0x79, 0xe5, 0x1b, 0xe5, 0xdd, 0xd5, 0xf2, 0xfc, 0x5c, + 0xd6, 0x8f, 0x00, 0xe1, 0x21, 0xde, 0x31, 0xb3, 0x82, 0xa4, 0xca, 0x8d, 0x92, 0x76, 0x82, 0xe8, + 0xad, 0x5c, 0x91, 0xcb, 0x79, 0x0b, 0xf7, 0x8d, 0x8d, 0x8a, 0xb4, 0x37, 0xa4, 0x55, 0x6f, 0x94, + 0xb6, 0xa7, 0xed, 0x12, 0x85, 0x21, 0x17, 0xf9, 0x05, 0xe0, 0xcc, 0xf0, 0xca, 0x0d, 0xf8, 0xa2, + 0xbc, 0xda, 0x6d, 0xfb, 0xfc, 0x12, 0x17, 0x15, 0x85, 0xa9, 0x7d, 0x4e, 0x59, 0x32, 0x2a, 0xec, + 0xb3, 0x7e, 0xdb, 0x3e, 0x8f, 0xe5, 0x8a, 0x5c, 0xce, 0x0b, 0x40, 0x70, 0xd1, 0x9e, 0x8d, 0x1b, + 0xa5, 0x6c, 0x05, 0x51, 0xd1, 0x96, 0x43, 0xd8, 0x49, 0x99, 0xc7, 0xf1, 0x46, 0x31, 0x64, 0x6c, + 0xde, 0x28, 0x63, 0x9b, 0x16, 0x68, 0x21, 0xf6, 0x57, 0xd0, 0xfa, 0xf1, 0x6c, 0xc4, 0xf8, 0xe4, + 0x5c, 0xe7, 0xfc, 0x7f, 0xba, 0xcc, 0xfc, 0x13, 0xcb, 0xcc, 0xe1, 0x28, 0x89, 0x66, 0x71, 0xa1, + 0x6a, 0xab, 0x1c, 0x5e, 0xaa, 0xda, 0x92, 0x47, 0x56, 0x6d, 0xc5, 0xfd, 0x19, 0xb4, 0x54, 0x93, + 0x45, 0x0b, 0x54, 0x15, 0xb2, 0x96, 0x93, 0x3e, 0x6b, 0xea, 0xd4, 0xb2, 0x3e, 0x35, 0xac, 0xb4, + 0xaa, 0x58, 0x8d, 0x72, 0x37, 0xe1, 0x17, 0x4b, 0x9e, 0x75, 0xaf, 0xa0, 0x3d, 0x56, 0xbe, 0xa1, + 0x55, 0x2a, 0x00, 0x3f, 0xce, 0x8c, 0xcb, 0xf7, 0x70, 0x60, 0xfa, 0x50, 0xb9, 0xba, 0x35, 0x36, + 0xdd, 0xfa, 0x1d, 0x00, 0xf1, 0x49, 0x32, 0xcc, 0x0a, 0x95, 0xf9, 0x22, 0xa9, 0x6f, 0x08, 0xfc, + 0xfe, 0xc9, 0x86, 0xbd, 0x53, 0xd8, 0x59, 0x92, 0xb9, 0xa2, 0x4c, 0x7d, 0xc3, 0x2c, 0x53, 0xcd, + 0xfe, 0x5d, 0x12, 0x69, 0x2e, 0x35, 0x6b, 0xd7, 0x1f, 0x4a, 0xea, 0x0b, 0x46, 0x3f, 0x1a, 0x59, + 0xcf, 0xa0, 0x1d, 0xaa, 0xe6, 0x4b, 0x1f, 0x40, 0xc5, 0x10, 0x64, 0x36, 0x66, 0x4e, 0x2b, 0x34, + 0xdb, 0x34, 0x3c, 0x08, 0x4f, 0x7a, 0x60, 0xe5, 0x41, 0x18, 0xce, 0x71, 0x9a, 0x9e, 0x71, 0xda, + 0x85, 0x66, 0xb0, 0xb2, 0xd8, 0x0c, 0xd2, 0x43, 0xc3, 0xba, 0x57, 0xd2, 0xfe, 0x3f, 0xea, 0x50, + 0x79, 0x3e, 0x78, 0x65, 0x9d, 0xc1, 0xf6, 0xe2, 0x9f, 0x0c, 0xd6, 0x43, 0x52, 0xbd, 0xe6, 0x8f, + 0x89, 0xde, 0x47, 0x6b, 0xe7, 0xa9, 0x5b, 0xbe, 0x63, 0x39, 0xb0, 0xb5, 0xf0, 0xa4, 0x6c, 0x65, + 0xd7, 0xc9, 0xea, 0x67, 0xfb, 0xde, 0xc3, 0x75, 0xd3, 0xa6, 0xcc, 0x85, 0xf6, 0x5c, 0xcb, 0x5c, + 0xfd, 0x79, 0xa7, 0x65, 0xae, 0xeb, 0xea, 0xef, 0x58, 0xdf, 0x83, 0xba, 0x7a, 0x64, 0xb6, 0x76, + 0x89, 0xb7, 0xf0, 0x7c, 0xdd, 0xbb, 0xb7, 0x80, 0xea, 0x85, 0xaf, 0xa1, 0x5d, 0xf8, 0x67, 0xc2, + 0xfa, 0xa0, 0xa0, 0xab, 0xf8, 0x46, 0xdd, 0xfb, 0x70, 0xf5, 0xa4, 0x96, 0x76, 0x08, 0x90, 0xbf, + 0x43, 0x5a, 0x5d, 0xe2, 0x5e, 0x7a, 0xeb, 0xee, 0xdd, 0x5f, 0x31, 0xa3, 0x85, 0xe0, 0x51, 0x2e, + 0xbe, 0x18, 0x5a, 0x0b, 0x5e, 0x5d, 0x7c, 0xaf, 0xd3, 0x47, 0xb9, 0xf6, 0xa9, 0x51, 0x8a, 0x5d, + 0x7c, 0x07, 0xd4, 0x62, 0xd7, 0xbc, 0x42, 0x6a, 0xb1, 0x6b, 0x1f, 0x10, 0xef, 0x58, 0x3f, 0x85, + 0x4e, 0xf1, 0x61, 0xcd, 0xca, 0x9c, 0xb4, 0xf2, 0x65, 0xb1, 0xf7, 0x60, 0xcd, 0xac, 0x16, 0xf8, + 0x29, 0xd4, 0xd4, 0x8b, 0x59, 0x96, 0x72, 0xe6, 0x43, 0x5b, 0x6f, 0xb7, 0x08, 0xea, 0x55, 0x4f, + 0xa0, 0xae, 0x3e, 0xec, 0x74, 0x00, 0x14, 0xbe, 0xf3, 0x7a, 0x2d, 0x13, 0xb5, 0xef, 0x3c, 0x29, + 0x65, 0x7a, 0xd2, 0x82, 0x9e, 0x74, 0x95, 0x1e, 0xe3, 0x70, 0xce, 0xeb, 0xf2, 0x5f, 0xbf, 0xa7, + 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x54, 0x60, 0xc5, 0x68, 0x02, 0x1c, 0x00, 0x00, } diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto index 7ae3a3d..c02a58c 100644 --- a/api/grpc/types/api.proto +++ b/api/grpc/types/api.proto @@ -127,6 +127,7 @@ message Checkpoint { bool tcp = 3; // allow open tcp connections bool unixSockets = 4; // allow external unix sockets bool shell = 5; // allow shell-jobs + repeated string emptyNS = 6; } message ListCheckpointResponse { diff --git a/containerd-shim/process.go b/containerd-shim/process.go index 6a876ed..ab923b8 100644 --- a/containerd-shim/process.go +++ b/containerd-shim/process.go @@ -32,6 +32,8 @@ type checkpoint struct { Shell bool `json:"shell"` // Exit exits the container after the checkpoint is finished Exit bool `json:"exit"` + // EmptyNS tells CRIU not to restore a particular namespace + EmptyNS []string `json:"emptyNS,omitempty"` } type processState struct { @@ -151,6 +153,10 @@ func (p *process) create() error { if p.state.NoPivotRoot { add("--no-pivot") } + for _, ns := range p.checkpoint.EmptyNS { + add("--empty-ns", ns) + } + } else { args = append(args, "create", "--bundle", p.bundle, diff --git a/ctr/checkpoint.go b/ctr/checkpoint.go index c6e39e9..eac3692 100644 --- a/ctr/checkpoint.go +++ b/ctr/checkpoint.go @@ -53,7 +53,7 @@ func listCheckpoints(context *cli.Context) { fatal("container id cannot be empty", ExitStatusMissingArg) } resp, err := c.ListCheckpoint(netcontext.Background(), &types.ListCheckpointRequest{ - Id: id, + Id: id, CheckpointDir: context.String("checkpoint-dir"), }) if err != nil { @@ -94,6 +94,10 @@ var createCheckpointCommand = cli.Command{ Value: "", Usage: "directory to store checkpoints", }, + cli.StringSliceFlag{ + Name: "empty-ns", + Usage: "create a namespace, but don't restore its properties", + }, }, Action: func(context *cli.Context) { var ( @@ -107,16 +111,21 @@ var createCheckpointCommand = cli.Command{ fatal("checkpoint name cannot be empty", ExitStatusMissingArg) } c := getClient(context) + checkpoint := types.Checkpoint{ + Name: name, + Exit: context.Bool("exit"), + Tcp: context.Bool("tcp"), + Shell: context.Bool("shell"), + UnixSockets: context.Bool("unix-sockets"), + } + + emptyNSes := context.StringSlice("empty-ns") + checkpoint.EmptyNS = append(checkpoint.EmptyNS, emptyNSes...) + if _, err := c.CreateCheckpoint(netcontext.Background(), &types.CreateCheckpointRequest{ - Id: containerID, + Id: containerID, CheckpointDir: context.String("checkpoint-dir"), - Checkpoint: &types.Checkpoint{ - Name: name, - Exit: context.Bool("exit"), - Tcp: context.Bool("tcp"), - Shell: context.Bool("shell"), - UnixSockets: context.Bool("unix-sockets"), - }, + Checkpoint: &checkpoint, }); err != nil { fatal(err.Error(), 1) } diff --git a/runtime/container.go b/runtime/container.go index 58c3176..079e6b8 100644 --- a/runtime/container.go +++ b/runtime/container.go @@ -369,6 +369,9 @@ func (c *container) Checkpoint(cpt Checkpoint, checkpointDir string) error { if cpt.UnixSockets { add("--ext-unix-sk") } + for _, ns := range cpt.EmptyNS { + add("--empty-ns", ns) + } add(c.id) out, err := exec.Command(c.runtime, args...).CombinedOutput() if err != nil { diff --git a/runtime/runtime.go b/runtime/runtime.go index f1f4ca7..55520fd 100644 --- a/runtime/runtime.go +++ b/runtime/runtime.go @@ -57,6 +57,8 @@ type Checkpoint struct { Shell bool `json:"shell"` // Exit exits the container after the checkpoint is finished Exit bool `json:"exit"` + // EmptyNS tells CRIU to omit a specified namespace + EmptyNS []string `json:"emptyNS,omitempty"` } // PlatformProcessState container platform-specific fields in the ProcessState structure