From 899a52d655011a18a6b7dc85856634e73ec4d10a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 2 Mar 2017 09:42:55 +0000 Subject: [PATCH] api: implement fetching the container status Signed-off-by: Akihiro Suda --- api/services/shim/shim.pb.go | 152 +++++++++++++++++----------- api/services/shim/shim.proto | 3 +- api/types/container/container.pb.go | 94 +++++++++-------- api/types/container/container.proto | 9 +- linux/container.go | 16 ++- linux/shim/init.go | 9 ++ linux/shim/service.go | 16 +++ services/execution/service.go | 3 + 8 files changed, 190 insertions(+), 112 deletions(-) diff --git a/api/services/shim/shim.pb.go b/api/services/shim/shim.pb.go index 3b73ace..2998254 100644 --- a/api/services/shim/shim.pb.go +++ b/api/services/shim/shim.pb.go @@ -169,7 +169,8 @@ type StateResponse struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Bundle string `protobuf:"bytes,2,opt,name=bundle,proto3" json:"bundle,omitempty"` Pid uint32 `protobuf:"varint,3,opt,name=pid,proto3" json:"pid,omitempty"` - Processes []*containerd_v1_types1.Process `protobuf:"bytes,4,rep,name=processes" json:"processes,omitempty"` + Status containerd_v1_types1.Status `protobuf:"varint,4,opt,name=status,proto3,enum=containerd.v1.types.Status" json:"status,omitempty"` + Processes []*containerd_v1_types1.Process `protobuf:"bytes,5,rep,name=processes" json:"processes,omitempty"` } func (m *StateResponse) Reset() { *m = StateResponse{} } @@ -1084,9 +1085,14 @@ func (m *StateResponse) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintShim(dAtA, i, uint64(m.Pid)) } + if m.Status != 0 { + dAtA[i] = 0x20 + i++ + i = encodeVarintShim(dAtA, i, uint64(m.Status)) + } if len(m.Processes) > 0 { for _, msg := range m.Processes { - dAtA[i] = 0x22 + dAtA[i] = 0x2a i++ i = encodeVarintShim(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) @@ -1385,6 +1391,9 @@ func (m *StateResponse) Size() (n int) { if m.Pid != 0 { n += 1 + sovShim(uint64(m.Pid)) } + if m.Status != 0 { + n += 1 + sovShim(uint64(m.Status)) + } if len(m.Processes) > 0 { for _, e := range m.Processes { l = e.Size() @@ -1564,6 +1573,7 @@ func (this *StateResponse) String() string { `ID:` + fmt.Sprintf("%v", this.ID) + `,`, `Bundle:` + fmt.Sprintf("%v", this.Bundle) + `,`, `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, + `Status:` + fmt.Sprintf("%v", this.Status) + `,`, `Processes:` + strings.Replace(fmt.Sprintf("%v", this.Processes), "Process", "containerd_v1_types1.Process", 1) + `,`, `}`, }, "") @@ -3071,6 +3081,25 @@ func (m *StateResponse) Unmarshal(dAtA []byte) error { } } case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) + } + m.Status = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowShim + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Status |= (containerd_v1_types1.Status(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Processes", wireType) } @@ -3382,63 +3411,64 @@ func init() { } var fileDescriptorShim = []byte{ - // 922 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0x5e, 0x27, 0xa9, 0xdb, 0xbc, 0xc6, 0xed, 0x32, 0x5a, 0x55, 0xde, 0x2c, 0xca, 0x06, 0xef, - 0x81, 0xb4, 0x08, 0x87, 0x2d, 0x17, 0x40, 0x42, 0x42, 0x4b, 0x8b, 0x00, 0x15, 0x14, 0x4d, 0xc5, - 0x09, 0x89, 0xc8, 0x89, 0x5f, 0x93, 0x11, 0xb6, 0xc7, 0xcc, 0x8c, 0xd3, 0xf6, 0xc6, 0x19, 0x89, - 0x9f, 0xc3, 0x7f, 0xd8, 0x23, 0x17, 0x24, 0x4e, 0x88, 0xcd, 0x2f, 0x41, 0x33, 0x63, 0x27, 0x0d, - 0x34, 0x49, 0xb9, 0x58, 0x6f, 0x3e, 0x7f, 0x6f, 0xe6, 0xf9, 0x7b, 0xdf, 0x3c, 0xc3, 0xc7, 0x13, - 0xa6, 0xa6, 0xc5, 0x28, 0x1c, 0xf3, 0xb4, 0x1f, 0xf3, 0xf1, 0x8f, 0x28, 0xfa, 0x63, 0x9e, 0xa9, - 0x88, 0x65, 0x28, 0xe2, 0x7e, 0x94, 0xb3, 0xbe, 0x44, 0x31, 0x63, 0x63, 0x94, 0x7d, 0x39, 0x65, - 0xa9, 0x79, 0x84, 0xb9, 0xe0, 0x8a, 0x93, 0x67, 0x4b, 0x62, 0x38, 0x7b, 0x19, 0x56, 0xbc, 0x50, - 0x53, 0xda, 0xcf, 0x26, 0x9c, 0x4f, 0x12, 0xec, 0x1b, 0xea, 0xa8, 0xb8, 0xea, 0x63, 0x9a, 0xab, - 0x5b, 0x9b, 0xd9, 0x7e, 0x32, 0xe1, 0x13, 0x6e, 0xc2, 0xbe, 0x8e, 0x4a, 0xf4, 0xa3, 0xad, 0xa5, - 0xa8, 0xdb, 0x1c, 0x65, 0x3f, 0xe5, 0x45, 0xa6, 0xec, 0xb3, 0xcc, 0xfc, 0xec, 0x81, 0x99, 0x0b, - 0x70, 0x19, 0xd9, 0x1d, 0x82, 0x5f, 0x6a, 0xe0, 0x7d, 0x2e, 0x30, 0x52, 0x48, 0xf1, 0xa7, 0x02, - 0xa5, 0x22, 0x47, 0x50, 0x63, 0xb1, 0xef, 0x74, 0x9d, 0x5e, 0xf3, 0x95, 0x3b, 0xff, 0xeb, 0x79, - 0xed, 0xab, 0x33, 0x5a, 0x63, 0x31, 0x39, 0x02, 0x77, 0x54, 0x64, 0x71, 0x82, 0x7e, 0x4d, 0xbf, - 0xa3, 0xe5, 0x8a, 0xf8, 0xb0, 0x2b, 0x8a, 0x4c, 0xb1, 0x14, 0xfd, 0xba, 0x79, 0x51, 0x2d, 0xc9, - 0x53, 0xd8, 0xcb, 0xf8, 0x30, 0x67, 0x33, 0xae, 0xfc, 0x46, 0xd7, 0xe9, 0xed, 0xd1, 0xdd, 0x8c, - 0x0f, 0xf4, 0x92, 0xb4, 0x61, 0x4f, 0xa1, 0x48, 0x59, 0x16, 0x25, 0xfe, 0x8e, 0x79, 0xb5, 0x58, - 0x93, 0x27, 0xb0, 0x23, 0x55, 0xcc, 0x32, 0xdf, 0x35, 0xdb, 0xd9, 0x85, 0x3e, 0x5e, 0xaa, 0x98, - 0x17, 0xca, 0xdf, 0xb5, 0xc7, 0xdb, 0x55, 0x89, 0xa3, 0x10, 0xfe, 0xde, 0x02, 0x47, 0x21, 0xc8, - 0x29, 0xb8, 0x82, 0x73, 0x75, 0x25, 0xfd, 0x66, 0xb7, 0xde, 0xdb, 0x3f, 0x6d, 0x87, 0xab, 0x5d, - 0x33, 0xc2, 0x84, 0xdf, 0x68, 0x31, 0x69, 0xc9, 0x0c, 0x02, 0x38, 0xa8, 0xb4, 0x90, 0x39, 0xcf, - 0x24, 0x92, 0xc7, 0x50, 0xcf, 0x4b, 0x35, 0x3c, 0xaa, 0xc3, 0xe0, 0x00, 0x5a, 0x97, 0x2a, 0x12, - 0xaa, 0x94, 0x2b, 0x78, 0x07, 0xbc, 0x33, 0x4c, 0x70, 0xa9, 0xdf, 0x7f, 0x53, 0x5e, 0xc2, 0x41, - 0x45, 0x29, 0xb7, 0x7d, 0x0e, 0xfb, 0x78, 0xc3, 0xd4, 0x50, 0xaa, 0x48, 0x15, 0xb2, 0xe4, 0x82, - 0x86, 0x2e, 0x0d, 0x12, 0xfc, 0x56, 0x87, 0xfd, 0xf3, 0x1b, 0x1c, 0x57, 0x9b, 0xde, 0xd5, 0xcb, - 0x59, 0xa7, 0x57, 0xed, 0x7e, 0xbd, 0xea, 0x6b, 0xf4, 0x6a, 0xac, 0xe8, 0xf5, 0x02, 0x3c, 0x89, - 0x09, 0xcb, 0x8a, 0x9b, 0x61, 0x12, 0x8d, 0xd0, 0xb6, 0xa5, 0x49, 0x5b, 0x25, 0x78, 0xa1, 0x31, - 0xf2, 0x3e, 0x34, 0x0a, 0x89, 0xc2, 0x74, 0x66, 0xff, 0xf4, 0xe9, 0xbd, 0x92, 0x7e, 0x27, 0x51, - 0x50, 0x43, 0x23, 0x04, 0x1a, 0x91, 0x98, 0x48, 0x7f, 0xb7, 0x5b, 0xef, 0x35, 0xa9, 0x89, 0xb5, - 0x3c, 0x98, 0xcd, 0xfc, 0x3d, 0x03, 0xe9, 0x50, 0x23, 0xe3, 0xeb, 0xd8, 0x6f, 0x9a, 0xf3, 0x74, - 0x48, 0x02, 0x68, 0x8d, 0xa3, 0x3c, 0x1a, 0xb1, 0x84, 0x29, 0x86, 0xd2, 0x07, 0x43, 0x5e, 0xc1, - 0xc8, 0xa7, 0xb0, 0x2b, 0x12, 0x96, 0x32, 0x25, 0xfd, 0x7d, 0xd3, 0xe0, 0x17, 0xe1, 0x86, 0x6b, - 0x19, 0x52, 0xc3, 0xa5, 0x55, 0x0e, 0x39, 0x81, 0xb7, 0x32, 0x3e, 0xcc, 0xf0, 0x7a, 0x98, 0x0b, - 0x36, 0x63, 0x09, 0x4e, 0x50, 0xfa, 0x2d, 0xa3, 0xec, 0x61, 0xc6, 0xbf, 0xc5, 0xeb, 0xc1, 0x02, - 0x26, 0xc7, 0xf0, 0x38, 0xca, 0xf3, 0x48, 0xa4, 0x5c, 0x0c, 0x73, 0xc1, 0xaf, 0x58, 0x82, 0xbe, - 0x67, 0xaa, 0x3d, 0xac, 0xf0, 0x81, 0x85, 0x83, 0x33, 0x70, 0xed, 0x49, 0xfa, 0xdb, 0xb5, 0x1e, - 0xf6, 0x22, 0x51, 0x13, 0x6b, 0x6c, 0x1a, 0x89, 0xd8, 0x34, 0xaa, 0x41, 0x4d, 0xac, 0x31, 0xc9, - 0xaf, 0x6c, 0x97, 0x1a, 0xd4, 0xc4, 0x41, 0x17, 0x5a, 0xb6, 0xf9, 0x6b, 0x5d, 0x78, 0x01, 0x30, - 0x50, 0xb7, 0x6b, 0x2d, 0xa7, 0x3d, 0x71, 0xcd, 0x62, 0x35, 0x35, 0x47, 0x79, 0xd4, 0x2e, 0x74, - 0xef, 0xa7, 0xc8, 0x26, 0x53, 0x7b, 0x9a, 0x47, 0xcb, 0x55, 0x70, 0x08, 0xde, 0xf9, 0x0c, 0x33, - 0x25, 0x2b, 0x53, 0x5b, 0x93, 0x2f, 0x3c, 0x1d, 0xfc, 0xea, 0x80, 0x57, 0x02, 0x65, 0x49, 0xff, - 0x77, 0x4a, 0x94, 0x25, 0xd6, 0x97, 0x25, 0x7e, 0x02, 0xcd, 0x5c, 0xf0, 0x31, 0x4a, 0x89, 0xd2, - 0x6f, 0x98, 0x16, 0xbe, 0x7d, 0xaf, 0xa1, 0x06, 0x96, 0x45, 0x97, 0x74, 0x5d, 0xdf, 0x20, 0x2a, - 0xe4, 0xa2, 0xbe, 0x43, 0xf0, 0x28, 0xca, 0x22, 0x5d, 0x00, 0x9e, 0xbe, 0x3e, 0xac, 0xba, 0xa4, - 0xa7, 0x7f, 0xb8, 0xd0, 0xb8, 0x9c, 0xb2, 0x94, 0x44, 0xe0, 0xda, 0x1b, 0x4e, 0x4e, 0x36, 0xda, - 0x65, 0x65, 0x24, 0xb6, 0xdf, 0x7b, 0x10, 0xb7, 0x54, 0xe6, 0x6b, 0xd8, 0x31, 0x03, 0x82, 0x1c, - 0x6f, 0xcc, 0xba, 0x3b, 0x44, 0xda, 0x47, 0xa1, 0xfd, 0x6b, 0x84, 0xd5, 0x5f, 0x23, 0x3c, 0xd7, - 0x7f, 0x0d, 0x5d, 0xae, 0x9d, 0x1c, 0x5b, 0xca, 0x5d, 0x99, 0x40, 0x5b, 0xca, 0xfd, 0xd7, 0x28, - 0xfa, 0x1e, 0x1a, 0xda, 0x6b, 0xa4, 0xb7, 0x31, 0xe9, 0xce, 0x2c, 0x6a, 0x1f, 0x3f, 0x80, 0x59, - 0x6e, 0xfe, 0x05, 0xd4, 0x07, 0xea, 0x96, 0xbc, 0xbb, 0x31, 0x63, 0x69, 0xe4, 0xb5, 0x3a, 0x50, - 0x70, 0xad, 0x41, 0xb7, 0xe8, 0xb0, 0xe2, 0xe2, 0xf6, 0xfd, 0x23, 0xdf, 0x70, 0x3e, 0x70, 0xc8, - 0x0f, 0xa6, 0x4f, 0x0a, 0xb7, 0xf7, 0x69, 0xa9, 0xec, 0xc9, 0x43, 0xa8, 0x4b, 0x1f, 0x18, 0x8f, - 0x6e, 0xd9, 0xff, 0xae, 0x8f, 0xd7, 0x7e, 0xff, 0x05, 0xb8, 0xd6, 0xdf, 0x5b, 0xbe, 0x7f, 0xe5, - 0x12, 0xac, 0xdd, 0xed, 0x4b, 0xdd, 0x72, 0xa6, 0xb6, 0xb6, 0x9c, 0x6d, 0xf3, 0xe7, 0x2b, 0xff, - 0xf5, 0x9b, 0xce, 0xa3, 0x3f, 0xdf, 0x74, 0x1e, 0xfd, 0x3c, 0xef, 0x38, 0xaf, 0xe7, 0x1d, 0xe7, - 0xf7, 0x79, 0xc7, 0xf9, 0x7b, 0xde, 0x71, 0x46, 0xae, 0x61, 0x7e, 0xf8, 0x4f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xec, 0x91, 0xac, 0xeb, 0x67, 0x09, 0x00, 0x00, + // 940 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0x5e, 0x27, 0xa9, 0xdb, 0xbc, 0xc4, 0xed, 0x32, 0x5a, 0x55, 0xb3, 0x29, 0xca, 0x06, 0xef, + 0x81, 0xb4, 0x08, 0x87, 0xcd, 0x5e, 0x00, 0x09, 0x09, 0x2d, 0x2d, 0x02, 0x54, 0x50, 0x34, 0x15, + 0x27, 0x24, 0x22, 0x27, 0x9e, 0x26, 0x23, 0x6c, 0x8f, 0x99, 0x19, 0xa7, 0xed, 0x8d, 0x33, 0xff, + 0x0f, 0xff, 0x00, 0xa7, 0x3d, 0x72, 0x41, 0xe2, 0x84, 0xd8, 0xfc, 0x25, 0x68, 0x66, 0xec, 0xa4, + 0x81, 0xfc, 0xe8, 0x5e, 0xac, 0x37, 0x9f, 0xbf, 0x37, 0x3f, 0xbe, 0xf7, 0xcd, 0x1b, 0xf8, 0x64, + 0xc2, 0xd4, 0x34, 0x1f, 0x05, 0x63, 0x9e, 0xf4, 0x22, 0x3e, 0xfe, 0x89, 0x8a, 0xde, 0x98, 0xa7, + 0x2a, 0x64, 0x29, 0x15, 0x51, 0x2f, 0xcc, 0x58, 0x4f, 0x52, 0x31, 0x63, 0x63, 0x2a, 0x7b, 0x72, + 0xca, 0x12, 0xf3, 0x09, 0x32, 0xc1, 0x15, 0x47, 0x27, 0x4b, 0x62, 0x30, 0x7b, 0x11, 0x94, 0xbc, + 0x40, 0x53, 0x5a, 0x27, 0x13, 0xce, 0x27, 0x31, 0xed, 0x19, 0xea, 0x28, 0xbf, 0xee, 0xd1, 0x24, + 0x53, 0x77, 0x36, 0xb3, 0xf5, 0x64, 0xc2, 0x27, 0xdc, 0x84, 0x3d, 0x1d, 0x15, 0xe8, 0xc7, 0x3b, + 0xb7, 0xa2, 0xee, 0x32, 0x2a, 0x7b, 0x09, 0xcf, 0x53, 0x65, 0xbf, 0x45, 0xe6, 0xe7, 0x0f, 0xcc, + 0x5c, 0x80, 0xcb, 0xc8, 0xce, 0xe0, 0xff, 0x5a, 0x01, 0xef, 0x0b, 0x41, 0x43, 0x45, 0x09, 0xfd, + 0x39, 0xa7, 0x52, 0xa1, 0x63, 0xa8, 0xb0, 0x08, 0x3b, 0x1d, 0xa7, 0x5b, 0x7f, 0xe5, 0xce, 0xff, + 0x7e, 0x56, 0xf9, 0xfa, 0x9c, 0x54, 0x58, 0x84, 0x8e, 0xc1, 0x1d, 0xe5, 0x69, 0x14, 0x53, 0x5c, + 0xd1, 0xff, 0x48, 0x31, 0x42, 0x18, 0xf6, 0x45, 0x9e, 0x2a, 0x96, 0x50, 0x5c, 0x35, 0x3f, 0xca, + 0x21, 0x7a, 0x0a, 0x07, 0x29, 0x1f, 0x66, 0x6c, 0xc6, 0x15, 0xae, 0x75, 0x9c, 0xee, 0x01, 0xd9, + 0x4f, 0xf9, 0x40, 0x0f, 0x51, 0x0b, 0x0e, 0x14, 0x15, 0x09, 0x4b, 0xc3, 0x18, 0xef, 0x99, 0x5f, + 0x8b, 0x31, 0x7a, 0x02, 0x7b, 0x52, 0x45, 0x2c, 0xc5, 0xae, 0x99, 0xce, 0x0e, 0xf4, 0xf2, 0x52, + 0x45, 0x3c, 0x57, 0x78, 0xdf, 0x2e, 0x6f, 0x47, 0x05, 0x4e, 0x85, 0xc0, 0x07, 0x0b, 0x9c, 0x0a, + 0x81, 0xfa, 0xe0, 0x0a, 0xce, 0xd5, 0xb5, 0xc4, 0xf5, 0x4e, 0xb5, 0xdb, 0xe8, 0xb7, 0x82, 0xd5, + 0xaa, 0x19, 0x61, 0x82, 0x6f, 0xb5, 0x98, 0xa4, 0x60, 0xfa, 0x3e, 0x1c, 0x96, 0x5a, 0xc8, 0x8c, + 0xa7, 0x92, 0xa2, 0xc7, 0x50, 0xcd, 0x0a, 0x35, 0x3c, 0xa2, 0x43, 0xff, 0x10, 0x9a, 0x57, 0x2a, + 0x14, 0xaa, 0x90, 0xcb, 0x7f, 0x0f, 0xbc, 0x73, 0x1a, 0xd3, 0xa5, 0x7e, 0xff, 0x4f, 0x79, 0x01, + 0x87, 0x25, 0xa5, 0x98, 0xf6, 0x19, 0x34, 0xe8, 0x2d, 0x53, 0x43, 0xa9, 0x42, 0x95, 0xcb, 0x82, + 0x0b, 0x1a, 0xba, 0x32, 0x88, 0xff, 0x5b, 0x15, 0x1a, 0x17, 0xb7, 0x74, 0x5c, 0x4e, 0x7a, 0x5f, + 0x2f, 0x67, 0x93, 0x5e, 0x95, 0xf5, 0x7a, 0x55, 0x37, 0xe8, 0x55, 0x5b, 0xd1, 0xeb, 0x39, 0x78, + 0x92, 0xc6, 0x2c, 0xcd, 0x6f, 0x87, 0x71, 0x38, 0xa2, 0xb6, 0x2c, 0x75, 0xd2, 0x2c, 0xc0, 0x4b, + 0x8d, 0xa1, 0x0f, 0xa1, 0x96, 0x4b, 0x2a, 0x4c, 0x65, 0x1a, 0xfd, 0xa7, 0x6b, 0x25, 0xfd, 0x5e, + 0x52, 0x41, 0x0c, 0x0d, 0x21, 0xa8, 0x85, 0x62, 0x22, 0xf1, 0x7e, 0xa7, 0xda, 0xad, 0x13, 0x13, + 0x6b, 0x79, 0x68, 0x3a, 0xc3, 0x07, 0x06, 0xd2, 0xa1, 0x46, 0xc6, 0x37, 0x11, 0xae, 0x9b, 0xf5, + 0x74, 0x88, 0x7c, 0x68, 0x8e, 0xc3, 0x2c, 0x1c, 0xb1, 0x98, 0x29, 0x46, 0x25, 0x06, 0x43, 0x5e, + 0xc1, 0xd0, 0x67, 0xb0, 0x2f, 0x62, 0x96, 0x30, 0x25, 0x71, 0xc3, 0x14, 0xf8, 0x79, 0xb0, 0xe5, + 0x5a, 0x06, 0xc4, 0x70, 0x49, 0x99, 0x83, 0xce, 0xe0, 0x9d, 0x94, 0x0f, 0x53, 0x7a, 0x33, 0xcc, + 0x04, 0x9b, 0xb1, 0x98, 0x4e, 0xa8, 0xc4, 0x4d, 0xa3, 0xec, 0x51, 0xca, 0xbf, 0xa3, 0x37, 0x83, + 0x05, 0x8c, 0x4e, 0xe1, 0x71, 0x98, 0x65, 0xa1, 0x48, 0xb8, 0x18, 0x66, 0x82, 0x5f, 0xb3, 0x98, + 0x62, 0xcf, 0xec, 0xf6, 0xa8, 0xc4, 0x07, 0x16, 0xf6, 0xcf, 0xc1, 0xb5, 0x2b, 0xe9, 0xb3, 0x6b, + 0x3d, 0xec, 0x45, 0x22, 0x26, 0xd6, 0xd8, 0x34, 0x14, 0x91, 0x29, 0x54, 0x8d, 0x98, 0x58, 0x63, + 0x92, 0x5f, 0xdb, 0x2a, 0xd5, 0x88, 0x89, 0xfd, 0x0e, 0x34, 0x6d, 0xf1, 0x37, 0xba, 0xf0, 0x12, + 0x60, 0xa0, 0xee, 0x36, 0x5a, 0x4e, 0x7b, 0xe2, 0x86, 0x45, 0x6a, 0x6a, 0x96, 0xf2, 0x88, 0x1d, + 0xe8, 0xda, 0x4f, 0x29, 0x9b, 0x4c, 0xed, 0x6a, 0x1e, 0x29, 0x46, 0xfe, 0x11, 0x78, 0x17, 0x33, + 0x9a, 0x2a, 0x59, 0x9a, 0xda, 0x9a, 0x7c, 0xe1, 0x69, 0xff, 0x77, 0x07, 0xbc, 0x02, 0x28, 0xb6, + 0xf4, 0xb6, 0x5d, 0xa2, 0xd8, 0x62, 0x75, 0xb9, 0xc5, 0x97, 0xda, 0x88, 0xc6, 0xfe, 0xda, 0x88, + 0x87, 0xfd, 0x93, 0xb5, 0x6e, 0xb2, 0xf7, 0x81, 0x14, 0x54, 0xf4, 0x29, 0xd4, 0x33, 0xc1, 0xc7, + 0x54, 0x4a, 0x2a, 0xf1, 0x9e, 0xa9, 0xfb, 0xbb, 0x6b, 0xf3, 0x06, 0x96, 0x45, 0x96, 0x74, 0x7d, + 0xa8, 0x41, 0x98, 0xcb, 0xc5, 0xa1, 0x8e, 0xc0, 0x23, 0x54, 0xe6, 0xc9, 0x02, 0xf0, 0xf4, 0x9d, + 0x63, 0xe5, 0xcd, 0xee, 0xff, 0xe9, 0x42, 0xed, 0x6a, 0xca, 0x12, 0x14, 0x82, 0x6b, 0xdb, 0x02, + 0x3a, 0xdb, 0xea, 0xb1, 0x95, 0x3e, 0xda, 0xfa, 0xe0, 0x41, 0xdc, 0x42, 0xce, 0x6f, 0x60, 0xcf, + 0x74, 0x15, 0x74, 0xba, 0x35, 0xeb, 0x7e, 0xe7, 0x69, 0x1d, 0x07, 0xf6, 0xa9, 0x09, 0xca, 0xa7, + 0x26, 0xb8, 0xd0, 0x4f, 0x8d, 0xde, 0xae, 0x6d, 0x37, 0x3b, 0xb6, 0xbb, 0xd2, 0xb6, 0x76, 0x6c, + 0xf7, 0x3f, 0xfd, 0xeb, 0x07, 0xa8, 0x69, 0x83, 0xa2, 0xee, 0xd6, 0xa4, 0x7b, 0x0d, 0xac, 0x75, + 0xfa, 0x00, 0x66, 0x31, 0xf9, 0x97, 0x50, 0x1d, 0xa8, 0x3b, 0xf4, 0xfe, 0xd6, 0x8c, 0xa5, 0xfb, + 0x37, 0xea, 0x40, 0xc0, 0xb5, 0xae, 0xde, 0xa1, 0xc3, 0x8a, 0xf5, 0x5b, 0xeb, 0xdf, 0x09, 0xc3, + 0xf9, 0xc8, 0x41, 0x3f, 0x9a, 0x3a, 0x29, 0xba, 0xbb, 0x4e, 0x4b, 0x65, 0xcf, 0x1e, 0x42, 0x5d, + 0xfa, 0xc0, 0x78, 0x74, 0xc7, 0xfc, 0xf7, 0x7d, 0xbc, 0xf1, 0xfc, 0x97, 0xe0, 0x5a, 0x7f, 0xef, + 0x38, 0xff, 0xca, 0x25, 0xd8, 0x38, 0xdb, 0x57, 0xba, 0xe4, 0x4c, 0xed, 0x2c, 0x39, 0xdb, 0xe5, + 0xcf, 0x57, 0xf8, 0xf5, 0x9b, 0xf6, 0xa3, 0xbf, 0xde, 0xb4, 0x1f, 0xfd, 0x32, 0x6f, 0x3b, 0xaf, + 0xe7, 0x6d, 0xe7, 0x8f, 0x79, 0xdb, 0xf9, 0x67, 0xde, 0x76, 0x46, 0xae, 0x61, 0xbe, 0xfc, 0x37, + 0x00, 0x00, 0xff, 0xff, 0x76, 0x3b, 0x6e, 0x21, 0x9c, 0x09, 0x00, 0x00, } diff --git a/api/services/shim/shim.proto b/api/services/shim/shim.proto index 6d2dde9..d3f9ee7 100644 --- a/api/services/shim/shim.proto +++ b/api/services/shim/shim.proto @@ -89,7 +89,8 @@ message StateResponse { string id = 1 [(gogoproto.customname) = "ID"]; string bundle = 2; uint32 pid = 3; - repeated containerd.v1.types.Process processes = 4; + containerd.v1.types.Status status = 4; + repeated containerd.v1.types.Process processes = 5; } diff --git a/api/types/container/container.pb.go b/api/types/container/container.pb.go index de8c232..83024f7 100644 --- a/api/types/container/container.pb.go +++ b/api/types/container/container.pb.go @@ -40,23 +40,26 @@ const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package type Status int32 const ( - Status_CREATED Status = 0 - Status_RUNNING Status = 1 - Status_STOPPED Status = 2 - Status_PAUSED Status = 3 + Status_UNKNOWN Status = 0 + Status_CREATED Status = 1 + Status_RUNNING Status = 2 + Status_STOPPED Status = 3 + Status_PAUSED Status = 4 ) var Status_name = map[int32]string{ - 0: "CREATED", - 1: "RUNNING", - 2: "STOPPED", - 3: "PAUSED", + 0: "UNKNOWN", + 1: "CREATED", + 2: "RUNNING", + 3: "STOPPED", + 4: "PAUSED", } var Status_value = map[string]int32{ - "CREATED": 0, - "RUNNING": 1, - "STOPPED": 2, - "PAUSED": 3, + "UNKNOWN": 0, + "CREATED": 1, + "RUNNING": 2, + "STOPPED": 3, + "PAUSED": 4, } func (x Status) String() string { @@ -1312,37 +1315,38 @@ func init() { } var fileDescriptorContainer = []byte{ - // 512 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xcd, 0xda, 0x8e, 0x93, 0x4c, 0xd4, 0x60, 0x2d, 0x08, 0x99, 0x22, 0xb9, 0x56, 0x84, 0x84, - 0x85, 0x84, 0x23, 0xd2, 0x0b, 0x12, 0x17, 0xd2, 0xd8, 0xaa, 0x72, 0x20, 0x09, 0x1b, 0x47, 0xea, - 0x2d, 0x72, 0xb3, 0x2b, 0xb3, 0xd0, 0xda, 0x91, 0xbd, 0x09, 0xf4, 0xc6, 0xe7, 0xf5, 0xc8, 0x91, - 0x13, 0xd0, 0x7c, 0x03, 0x1f, 0x80, 0x76, 0x93, 0xd4, 0x55, 0x15, 0xa4, 0x5e, 0xa2, 0x37, 0x93, - 0x37, 0x6f, 0xe7, 0xbd, 0x31, 0xbc, 0x4f, 0xb8, 0xf8, 0xb4, 0x3c, 0xf7, 0xe7, 0xd9, 0x65, 0x87, - 0x66, 0xf3, 0x2f, 0x2c, 0xef, 0xcc, 0xb3, 0x54, 0xc4, 0x3c, 0x65, 0x39, 0xed, 0xc4, 0x0b, 0xde, - 0x11, 0x57, 0x0b, 0x56, 0x94, 0xcd, 0x12, 0xf9, 0x8b, 0x3c, 0x13, 0x19, 0x7e, 0x5c, 0xf2, 0xfd, - 0xd5, 0x1b, 0x5f, 0xd1, 0x0f, 0x9f, 0x24, 0x59, 0x92, 0xa9, 0xff, 0x3b, 0x12, 0x6d, 0xa8, 0xed, - 0xcf, 0xd0, 0xe8, 0xef, 0xc8, 0xf8, 0x29, 0x68, 0x9c, 0xda, 0xc8, 0x45, 0x5e, 0xe3, 0xc4, 0x5c, - 0xff, 0x3a, 0xd2, 0x06, 0x01, 0xd1, 0x38, 0xc5, 0x16, 0xe8, 0x0b, 0x4e, 0x6d, 0xcd, 0x45, 0xde, - 0x01, 0x91, 0x10, 0x1f, 0x83, 0x59, 0x88, 0x58, 0x2c, 0x0b, 0x5b, 0x77, 0x91, 0xd7, 0xea, 0x3e, - 0xf7, 0xf7, 0x3c, 0xe9, 0x4f, 0x14, 0x85, 0x6c, 0xa9, 0xed, 0xbf, 0x08, 0x6a, 0xe3, 0x3c, 0x9b, - 0xb3, 0xa2, 0xd8, 0x49, 0xa2, 0x52, 0x12, 0x83, 0x11, 0xe7, 0x49, 0x61, 0x6b, 0xae, 0xee, 0x35, - 0x88, 0xc2, 0x92, 0xc5, 0xd2, 0x95, 0xad, 0xab, 0x96, 0x84, 0xf8, 0x35, 0x18, 0xcb, 0x82, 0xe5, - 0xb6, 0xe1, 0x22, 0xaf, 0xd9, 0x7d, 0xb6, 0xf7, 0xd9, 0x69, 0xc1, 0x72, 0xa2, 0x68, 0x52, 0x60, - 0xfe, 0x95, 0xda, 0x55, 0x69, 0x89, 0x48, 0x88, 0x0f, 0xa1, 0x2e, 0x58, 0x7e, 0xc9, 0xd3, 0xf8, - 0xc2, 0x36, 0x5d, 0xe4, 0xd5, 0xc9, 0x6d, 0x8d, 0x8f, 0xa0, 0xc9, 0xbe, 0x71, 0x31, 0xdb, 0x5a, - 0xab, 0xa9, 0xe5, 0x40, 0xb6, 0x36, 0x4e, 0xee, 0xd8, 0xae, 0x3f, 0xdc, 0xf6, 0x04, 0x8c, 0xe9, - 0x76, 0x97, 0x65, 0x69, 0x79, 0xb9, 0xc9, 0x35, 0x29, 0x73, 0x4d, 0x38, 0xc5, 0x2f, 0xe1, 0x51, - 0x4c, 0x29, 0x17, 0x3c, 0x4b, 0xe3, 0x8b, 0x59, 0xc2, 0x69, 0xa1, 0xcc, 0x1f, 0x90, 0x56, 0xd9, - 0x3e, 0xe5, 0xb4, 0x68, 0xff, 0x46, 0x50, 0x0d, 0x57, 0x2c, 0x15, 0xff, 0x3d, 0xda, 0x5b, 0x30, - 0xe4, 0x3a, 0x4a, 0xbd, 0xd5, 0x7d, 0xb1, 0x77, 0x53, 0xa5, 0xb0, 0xf9, 0x8d, 0xae, 0x16, 0x8c, - 0xa8, 0x89, 0xdd, 0x6d, 0xf4, 0xf2, 0x36, 0xf7, 0x82, 0x31, 0xee, 0x07, 0xd3, 0xfe, 0x08, 0x8d, - 0x5b, 0x15, 0x5c, 0x07, 0x23, 0x3c, 0x1b, 0x44, 0x56, 0x05, 0xd7, 0x40, 0x1f, 0x8d, 0x3e, 0x58, - 0x08, 0x03, 0x98, 0x7d, 0x12, 0xf6, 0xa2, 0xd0, 0xd2, 0x70, 0x03, 0xaa, 0x93, 0xa8, 0x47, 0x22, - 0x4b, 0xc7, 0x2d, 0x80, 0xf0, 0x2c, 0xec, 0xcf, 0x7a, 0x41, 0x10, 0x06, 0x96, 0x21, 0x69, 0xe3, - 0xde, 0x74, 0x12, 0x06, 0x56, 0xf5, 0xd5, 0x3b, 0x30, 0xb7, 0xa9, 0x37, 0xa1, 0xb6, 0x19, 0x0e, - 0xac, 0x8a, 0x2c, 0xc8, 0x74, 0x38, 0x1c, 0x0c, 0x4f, 0x2d, 0x24, 0x8b, 0x49, 0x34, 0x1a, 0x8f, - 0xc3, 0xc0, 0xd2, 0xee, 0x0c, 0xeb, 0x27, 0xf6, 0xf5, 0x8d, 0x53, 0xf9, 0x79, 0xe3, 0x54, 0xbe, - 0xaf, 0x1d, 0x74, 0xbd, 0x76, 0xd0, 0x8f, 0xb5, 0x83, 0xfe, 0xac, 0x1d, 0x74, 0x6e, 0xaa, 0xef, - 0xfe, 0xf8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0x2b, 0xb0, 0x86, 0x66, 0x03, 0x00, 0x00, + // 521 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x41, 0x6f, 0xd3, 0x4c, + 0x10, 0xcd, 0xda, 0x8e, 0x93, 0x4c, 0xd5, 0x7c, 0xab, 0xfd, 0x10, 0x32, 0x45, 0x72, 0xad, 0x08, + 0x09, 0x0b, 0x09, 0x47, 0xb4, 0x17, 0x8e, 0xa4, 0xb1, 0x55, 0x22, 0x84, 0x13, 0x36, 0x8e, 0xe8, + 0x2d, 0x72, 0xb3, 0x2b, 0xb3, 0xd0, 0xda, 0x91, 0xed, 0x04, 0x7a, 0xe3, 0xe7, 0xf5, 0xc8, 0x91, + 0x13, 0xd0, 0xfc, 0x06, 0x7e, 0x00, 0xda, 0x4d, 0x52, 0x57, 0x55, 0x90, 0xb8, 0x58, 0x6f, 0xc6, + 0xcf, 0x6f, 0xe6, 0xbd, 0x91, 0xe1, 0x55, 0x22, 0xca, 0x0f, 0x8b, 0x73, 0x6f, 0x96, 0x5d, 0x76, + 0x59, 0x36, 0xfb, 0xc4, 0xf3, 0xee, 0x2c, 0x4b, 0xcb, 0x58, 0xa4, 0x3c, 0x67, 0xdd, 0x78, 0x2e, + 0xba, 0xe5, 0xd5, 0x9c, 0x17, 0x55, 0xb3, 0x42, 0xde, 0x3c, 0xcf, 0xca, 0x8c, 0xfc, 0x5f, 0xf1, + 0xbd, 0xe5, 0x0b, 0x4f, 0xd1, 0x0f, 0x1e, 0x24, 0x59, 0x92, 0xa9, 0xf7, 0x5d, 0x89, 0xd6, 0xd4, + 0xce, 0x47, 0x68, 0xf5, 0xb7, 0x64, 0xf2, 0x10, 0x34, 0xc1, 0x2c, 0xe4, 0x20, 0xb7, 0x75, 0x62, + 0xae, 0x7e, 0x1c, 0x6a, 0x03, 0x9f, 0x6a, 0x82, 0x11, 0x0c, 0xfa, 0x5c, 0x30, 0x4b, 0x73, 0x90, + 0xbb, 0x4f, 0x25, 0x24, 0xc7, 0x60, 0x16, 0x65, 0x5c, 0x2e, 0x0a, 0x4b, 0x77, 0x90, 0xdb, 0x3e, + 0x7a, 0xec, 0xed, 0x18, 0xe9, 0x8d, 0x15, 0x85, 0x6e, 0xa8, 0x9d, 0xdf, 0x08, 0x1a, 0xa3, 0x3c, + 0x9b, 0xf1, 0xa2, 0xd8, 0x4a, 0xa2, 0x4a, 0x92, 0x80, 0x11, 0xe7, 0x49, 0x61, 0x69, 0x8e, 0xee, + 0xb6, 0xa8, 0xc2, 0x92, 0xc5, 0xd3, 0xa5, 0xa5, 0xab, 0x96, 0x84, 0xe4, 0x39, 0x18, 0x8b, 0x82, + 0xe7, 0x96, 0xe1, 0x20, 0x77, 0xef, 0xe8, 0xd1, 0xce, 0xb1, 0x93, 0x82, 0xe7, 0x54, 0xd1, 0xa4, + 0xc0, 0xec, 0x33, 0xb3, 0xea, 0xd2, 0x12, 0x95, 0x90, 0x1c, 0x40, 0xb3, 0xe4, 0xf9, 0xa5, 0x48, + 0xe3, 0x0b, 0xcb, 0x74, 0x90, 0xdb, 0xa4, 0xb7, 0x35, 0x39, 0x84, 0x3d, 0xfe, 0x45, 0x94, 0xd3, + 0x8d, 0xb5, 0x86, 0x5a, 0x0e, 0x64, 0x6b, 0xed, 0xe4, 0x8e, 0xed, 0xe6, 0xbf, 0xdb, 0x1e, 0x83, + 0x31, 0xd9, 0xec, 0xb2, 0xa8, 0x2c, 0x2f, 0xd6, 0xb9, 0x26, 0x55, 0xae, 0x89, 0x60, 0xe4, 0x29, + 0xfc, 0x17, 0x33, 0x26, 0x4a, 0x91, 0xa5, 0xf1, 0xc5, 0x34, 0x11, 0xac, 0x50, 0xe6, 0xf7, 0x69, + 0xbb, 0x6a, 0x9f, 0x0a, 0x56, 0x74, 0x7e, 0x22, 0xa8, 0x07, 0x4b, 0x9e, 0x96, 0x7f, 0x3d, 0xda, + 0x4b, 0x30, 0xe4, 0x3a, 0x4a, 0xbd, 0x7d, 0xf4, 0x64, 0xe7, 0xa6, 0x4a, 0x61, 0xfd, 0x8c, 0xae, + 0xe6, 0x9c, 0xaa, 0x2f, 0xb6, 0xb7, 0xd1, 0xab, 0xdb, 0xdc, 0x0b, 0xc6, 0xb8, 0x1f, 0x4c, 0xe7, + 0x1d, 0xb4, 0x6e, 0x55, 0x48, 0x13, 0x8c, 0xe0, 0x6c, 0x10, 0xe1, 0x1a, 0x69, 0x80, 0x3e, 0x1c, + 0xbe, 0xc5, 0x88, 0x00, 0x98, 0x7d, 0x1a, 0xf4, 0xa2, 0x00, 0x6b, 0xa4, 0x05, 0xf5, 0x71, 0xd4, + 0xa3, 0x11, 0xd6, 0x49, 0x1b, 0x20, 0x38, 0x0b, 0xfa, 0xd3, 0x9e, 0xef, 0x07, 0x3e, 0x36, 0x24, + 0x6d, 0xd4, 0x9b, 0x8c, 0x03, 0x1f, 0xd7, 0x9f, 0xbd, 0x06, 0x73, 0x93, 0xfa, 0x1e, 0x34, 0x26, + 0xe1, 0x9b, 0x70, 0xf8, 0x3e, 0xc4, 0x35, 0x59, 0xac, 0x95, 0x7c, 0x8c, 0x64, 0x41, 0x27, 0x61, + 0x38, 0x08, 0x4f, 0xb1, 0x26, 0x8b, 0x71, 0x34, 0x1c, 0x8d, 0x02, 0x1f, 0xeb, 0x77, 0x94, 0x8c, + 0x13, 0xeb, 0xfa, 0xc6, 0xae, 0x7d, 0xbf, 0xb1, 0x6b, 0x5f, 0x57, 0x36, 0xba, 0x5e, 0xd9, 0xe8, + 0xdb, 0xca, 0x46, 0xbf, 0x56, 0x36, 0x3a, 0x37, 0xd5, 0x4f, 0x70, 0xfc, 0x27, 0x00, 0x00, 0xff, + 0xff, 0xf6, 0xd9, 0x16, 0xff, 0x73, 0x03, 0x00, 0x00, } diff --git a/api/types/container/container.proto b/api/types/container/container.proto index c220288..e7ff586 100644 --- a/api/types/container/container.proto +++ b/api/types/container/container.proto @@ -5,10 +5,11 @@ package containerd.v1.types; import "gogoproto/gogo.proto"; enum Status { - CREATED = 0; - RUNNING = 1; - STOPPED = 2; - PAUSED = 3; + UNKNOWN = 0; + CREATED = 1; + RUNNING = 2; + STOPPED = 3; + PAUSED = 4; } message Container { diff --git a/linux/container.go b/linux/container.go index 6e4ae9f..19fd0a3 100644 --- a/linux/container.go +++ b/linux/container.go @@ -3,6 +3,7 @@ package linux import ( "github.com/docker/containerd" "github.com/docker/containerd/api/services/shim" + "github.com/docker/containerd/api/types/container" "golang.org/x/net/context" ) @@ -42,7 +43,20 @@ func (c *Container) State(ctx context.Context) (containerd.State, error) { if err != nil { return nil, err } + var status containerd.ContainerStatus + switch response.Status { + case container.Status_CREATED: + status = containerd.CreatedStatus + case container.Status_RUNNING: + status = containerd.RunningStatus + case container.Status_STOPPED: + status = containerd.StoppedStatus + case container.Status_PAUSED: + status = containerd.PausedStatus + // TODO: containerd.DeletedStatus + } return &State{ - pid: response.Pid, + pid: response.Pid, + status: status, }, nil } diff --git a/linux/shim/init.go b/linux/shim/init.go index f975339..e7b9347 100644 --- a/linux/shim/init.go +++ b/linux/shim/init.go @@ -106,6 +106,15 @@ func (p *initProcess) Status() int { return p.status } +// ContainerStatus return the state of the container (created, running, paused, stopped) +func (p *initProcess) ContainerStatus(ctx context.Context) (string, error) { + c, err := p.runc.State(ctx, p.id) + if err != nil { + return "", err + } + return c.Status, nil +} + func (p *initProcess) Start(context context.Context) error { return p.runc.Start(context, p.id) } diff --git a/linux/shim/service.go b/linux/shim/service.go index 396751b..4cc8fd0 100644 --- a/linux/shim/service.go +++ b/linux/shim/service.go @@ -136,10 +136,26 @@ func (s *Service) Events(r *shimapi.EventsRequest, stream shimapi.Shim_EventsSer } func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.StateResponse, error) { + st, err := s.initProcess.ContainerStatus(ctx) + if err != nil { + return nil, err + } + status := container.Status_UNKNOWN + switch st { + case "created": + status = container.Status_CREATED + case "running": + status = container.Status_RUNNING + case "stopped": + status = container.Status_STOPPED + case "paused": + status = container.Status_PAUSED + } o := &shimapi.StateResponse{ ID: s.id, Bundle: s.bundle, Pid: uint32(s.initProcess.Pid()), + Status: status, Processes: []*container.Process{}, } s.mu.Lock() diff --git a/services/execution/service.go b/services/execution/service.go index b026ac4..91285d2 100644 --- a/services/execution/service.go +++ b/services/execution/service.go @@ -6,6 +6,7 @@ import ( "github.com/docker/containerd" api "github.com/docker/containerd/api/services/execution" "github.com/docker/containerd/api/types/container" + "github.com/docker/containerd/log" google_protobuf "github.com/golang/protobuf/ptypes/empty" "golang.org/x/net/context" "google.golang.org/grpc" @@ -151,6 +152,8 @@ func containerFromContainerd(ctx context.Context, c containerd.Container) (*cont status = container.Status_STOPPED case containerd.PausedStatus: status = container.Status_PAUSED + default: + log.G(ctx).WithField("status", state.Status()).Warn("unknown status") } return &container.Container{ ID: c.Info().ID,