github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix Wait() on process/tasks

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-06-21 13:32:56 -07:00
parent 8830866eed
commit 8b2cf6e8e6
15 changed files with 238 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
api/services/execution/execution.pb.go
View File

@ -124,8 +124,9 @@ func (*DeleteTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorEx
type DeleteResponse struct {
ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"`
ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
Pid uint32 `protobuf:"varint,2,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,3,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,4,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
}
func (m *DeleteResponse) Reset() { *m = DeleteResponse{} }
@ -1092,12 +1093,17 @@ func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) {
i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID)))
i += copy(dAtA[i:], m.ContainerID)
}
if m.ExitStatus != 0 {
if m.Pid != 0 {
dAtA[i] = 0x10
i++
i = encodeVarintExecution(dAtA, i, uint64(m.Pid))
}
if m.ExitStatus != 0 {
dAtA[i] = 0x18
i++
i = encodeVarintExecution(dAtA, i, uint64(m.ExitStatus))
}
dAtA[i] = 0x1a
dAtA[i] = 0x22
i++
i = encodeVarintExecution(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)))
n2, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i:])
@ -1742,6 +1748,9 @@ func (m *DeleteResponse) Size() (n int) {
if l > 0 {
n += 1 + l + sovExecution(uint64(l))
}
if m.Pid != 0 {
n += 1 + sovExecution(uint64(m.Pid))
}
if m.ExitStatus != 0 {
n += 1 + sovExecution(uint64(m.ExitStatus))
}
@ -2048,6 +2057,7 @@ func (this *DeleteResponse) String() string {
}
s := strings.Join([]string{`&DeleteResponse{`,
`ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf3.Timestamp", 1), `&`, ``, 1) + `,`,
`}`,
@ -2832,6 +2842,25 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
m.ContainerID = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Pid", wireType)
}
m.Pid = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowExecution
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.Pid |= (uint32(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ExitStatus", wireType)
}
@ -2850,7 +2879,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
break
}
}
case 3:
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ExitedAt", wireType)
}
@ -4735,80 +4764,79 @@ func init() {
}
var fileDescriptorExecution = []byte{
// 1185 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x53, 0xdb, 0x46,
0x14, 0x47, 0xfe, 0x17, 0xf3, 0x1c, 0x08, 0x6c, 0x09, 0xe3, 0xa8, 0x19, 0x9b, 0xd1, 0xa5, 0x6e,
0xa6, 0xc8, 0xc5, 0xf4, 0xd0, 0x61, 0x3a, 0xd3, 0x00, 0x26, 0x94, 0xfe, 0x19, 0xa8, 0xc8, 0x29,
0xed, 0x8c, 0x47, 0x58, 0x8b, 0xd9, 0xb1, 0x2c, 0x29, 0xda, 0x35, 0xc1, 0x3d, 0xf5, 0xd4, 0x6b,
0xfb, 0x09, 0x7a, 0xee, 0x07, 0xe9, 0x81, 0x63, 0x0f, 0x3d, 0x74, 0x7a, 0xa0, 0x0d, 0xfd, 0x22,
0x9d, 0x5d, 0xad, 0x64, 0xd9, 0xd8, 0x96, 0x1d, 0x73, 0xb1, 0x77, 0x57, 0xef, 0xf7, 0xf6, 0xfd,
0xdb, 0xf7, 0x7b, 0x70, 0xd8, 0x22, 0xec, 0xa2, 0x7b, 0xa6, 0x37, 0xdd, 0x4e, 0xb5, 0xe9, 0x3a,
0xcc, 0x24, 0x0e, 0xf6, 0xad, 0xf8, 0xd2, 0xf4, 0x48, 0x95, 0x62, 0xff, 0x92, 0x34, 0x31, 0xad,
0xe2, 0x2b, 0xdc, 0xec, 0x32, 0xe2, 0x3a, 0xfd, 0x95, 0xee, 0xf9, 0x2e, 0x73, 0xd1, 0xd3, 0x3e,
0x44, 0x0f, 0xc5, 0x75, 0x66, 0xd2, 0x36, 0xd5, 0x2f, 0xb7, 0xd4, 0xf7, 0x5b, 0xae, 0xdb, 0xb2,
0x71, 0x55, 0xc8, 0x9e, 0x75, 0xcf, 0xab, 0xb8, 0xe3, 0xb1, 0x5e, 0x00, 0x55, 0x9f, 0x0c, 0x7f,
0x34, 0x9d, 0xf0, 0xd3, 0x5a, 0xcb, 0x6d, 0xb9, 0x62, 0x59, 0xe5, 0x2b, 0x79, 0xfa, 0xd9, 0x54,
0x46, 0xb3, 0x9e, 0x87, 0x69, 0xb5, 0xe3, 0x76, 0x1d, 0x16, 0xfc, 0x4a, 0xf4, 0x8b, 0x19, 0xd0,
0x16, 0xa6, 0x4d, 0x9f, 0x78, 0xcc, 0xf5, 0x63, 0x4b, 0xa9, 0x67, 0x67, 0x06, 0x3d, 0x3c, 0x10,
0xe2, 0x47, 0x62, 0xcb, 0xc3, 0x2e, 0x33, 0xd2, 0xc1, 0x94, 0x99, 0x1d, 0x2f, 0x10, 0xd0, 0x7e,
0x4d, 0xc1, 0xea, 0xbe, 0x8f, 0x4d, 0x86, 0x5f, 0x9a, 0xb4, 0x6d, 0xe0, 0xd7, 0x5d, 0x4c, 0x19,
0xaa, 0xc1, 0xc3, 0x48, 0x7d, 0x83, 0x58, 0xc5, 0xd4, 0x86, 0x52, 0x59, 0xdc, 0x7b, 0x74, 0x7b,
0x53, 0x2e, 0xec, 0x87, 0xe7, 0x47, 0x75, 0xa3, 0x10, 0x09, 0x1d, 0x59, 0xa8, 0x06, 0x39, 0xdf,
0x75, 0xd9, 0x39, 0x2d, 0xa6, 0x37, 0xd2, 0x95, 0x42, 0x4d, 0xd5, 0x63, 0x99, 0xba, 0xdc, 0xd2,
0x85, 0x81, 0xfa, 0x37, 0x3c, 0x40, 0x86, 0x94, 0x44, 0x6b, 0x90, 0xa5, 0xcc, 0x22, 0x4e, 0x31,
0xc3, 0x2f, 0x30, 0x82, 0x0d, 0x5a, 0x87, 0x1c, 0x65, 0x96, 0xdb, 0x65, 0xc5, 0xac, 0x38, 0x96,
0x3b, 0x79, 0x8e, 0x7d, 0xbf, 0x98, 0x8b, 0xce, 0xb1, 0xef, 0x23, 0x15, 0xf2, 0x0c, 0xfb, 0x1d,
0xe2, 0x98, 0x76, 0xf1, 0xc1, 0x86, 0x52, 0xc9, 0x1b, 0xd1, 0x1e, 0x7d, 0x0e, 0xd0, 0xbc, 0xc0,
0xcd, 0xb6, 0xe7, 0x12, 0x87, 0x15, 0xf3, 0x1b, 0x4a, 0xa5, 0x50, 0x2b, 0x8f, 0xb4, 0xac, 0x1e,
0xc5, 0xdd, 0x88, 0x41, 0xb4, 0x57, 0x80, 0xe2, 0xf1, 0xa1, 0x9e, 0xeb, 0x50, 0xfc, 0x4e, 0x01,
0x5a, 0x81, 0xb4, 0x47, 0xac, 0x62, 0x7a, 0x43, 0xa9, 0x2c, 0x19, 0x7c, 0xa9, 0xbd, 0x80, 0x95,
0x53, 0x66, 0xfa, 0x6c, 0x52, 0xe8, 0x95, 0x64, 0xcd, 0xda, 0x21, 0xac, 0xd6, 0xb1, 0x8d, 0x27,
0xe7, 0x70, 0x1a, 0x45, 0xbf, 0x29, 0xb0, 0x1c, 0x68, 0x1a, 0xeb, 0xe9, 0x14, 0x6a, 0x50, 0x19,
0x0a, 0xf8, 0x8a, 0xb0, 0x06, 0x65, 0x26, 0xeb, 0x52, 0x11, 0x9c, 0x25, 0x03, 0xf8, 0xd1, 0xa9,
0x38, 0x41, 0xbb, 0xb0, 0xc8, 0x77, 0xd8, 0x6a, 0x98, 0x4c, 0x04, 0x84, 0x97, 0x4b, 0x50, 0xaa,
0x7a, 0x58, 0xaa, 0xfa, 0xcb, 0xb0, 0x54, 0xf7, 0xf2, 0xd7, 0x37, 0xe5, 0x85, 0x5f, 0xfe, 0x29,
0x2b, 0x46, 0x3e, 0x80, 0xed, 0x32, 0xed, 0x7b, 0x58, 0x0b, 0x2c, 0x3d, 0xf1, 0xdd, 0x26, 0xa6,
0x74, 0x0e, 0xb7, 0xc3, 0xcc, 0xa4, 0xfa, 0x99, 0xa9, 0xc3, 0xf2, 0x21, 0x9e, 0x3b, 0x2f, 0xcf,
0xe1, 0x51, 0xa4, 0x45, 0x86, 0x73, 0x13, 0x32, 0xfc, 0x79, 0x0a, 0x78, 0xa1, 0xf6, 0x64, 0x64,
0x25, 0x0a, 0x80, 0x10, 0xd3, 0x9e, 0xc1, 0xca, 0xd7, 0x84, 0x0a, 0x15, 0x91, 0x87, 0xeb, 0x90,
0x3b, 0x27, 0x36, 0xc3, 0x7e, 0x60, 0x83, 0x21, 0x77, 0x5a, 0x1d, 0x56, 0x63, 0xb2, 0xf2, 0xbe,
0x2a, 0x64, 0x45, 0x73, 0x2c, 0x2a, 0xe2, 0x51, 0x4e, 0xb8, 0x30, 0x90, 0xd3, 0x7e, 0x56, 0xa0,
0xf0, 0x15, 0xb1, 0xed, 0x79, 0xe2, 0xc9, 0x1f, 0x2a, 0x69, 0xf1, 0xe7, 0x18, 0x84, 0x54, 0xee,
0x10, 0x82, 0xb4, 0x69, 0xdb, 0x22, 0xe1, 0xf9, 0x2f, 0x16, 0x0c, 0xbe, 0xe1, 0x67, 0x3c, 0xf6,
0xbc, 0x01, 0x2c, 0xf1, 0x33, 0x8f, 0x58, 0x7b, 0x0f, 0x01, 0x3c, 0x62, 0x35, 0x5c, 0xbf, 0x61,
0xda, 0xb6, 0xf6, 0xa7, 0x02, 0xe8, 0xe0, 0x0a, 0x37, 0xef, 0x21, 0xd1, 0x51, 0xbf, 0x49, 0x8d,
0xee, 0x37, 0xe9, 0x31, 0xfd, 0x26, 0x33, 0xb6, 0xdf, 0x64, 0x87, 0xfa, 0x4d, 0x05, 0x32, 0xd4,
0xc3, 0x4d, 0xd1, 0xa1, 0x0a, 0xb5, 0xb5, 0x3b, 0x45, 0xbd, 0xeb, 0xf4, 0x0c, 0x21, 0xa1, 0x7d,
0x00, 0xef, 0x0d, 0x78, 0x25, 0x13, 0x26, 0x6b, 0x51, 0xe9, 0xd7, 0xe2, 0x4f, 0x0a, 0xac, 0x18,
0x98, 0x92, 0x1f, 0xf0, 0x09, 0xeb, 0xdd, 0x6b, 0x99, 0xf3, 0x78, 0xbc, 0x21, 0x16, 0xbb, 0x90,
0x4d, 0x29, 0xd8, 0x70, 0xbf, 0x2f, 0x30, 0x69, 0x5d, 0xb0, 0x20, 0x2b, 0x86, 0xdc, 0x69, 0x36,
0x2c, 0xef, 0xdb, 0x2e, 0xc5, 0x47, 0xc7, 0xf7, 0x6e, 0x45, 0x90, 0x15, 0x51, 0x18, 0x32, 0x2b,
0xbc, 0x39, 0x9e, 0x98, 0x5d, 0x8a, 0xef, 0xa1, 0x39, 0x1a, 0x98, 0x76, 0x3b, 0x73, 0x2b, 0xfa,
0x12, 0xd6, 0xf8, 0xfb, 0x92, 0x09, 0xc3, 0xf3, 0x14, 0xa2, 0x76, 0x0a, 0x8f, 0x87, 0x74, 0xc9,
0xf4, 0xef, 0xc0, 0xa2, 0x17, 0x1e, 0xca, 0x37, 0xfb, 0x74, 0xe4, 0x9b, 0x0d, 0xeb, 0xa6, 0x2f,
0xae, 0xfd, 0x9e, 0x82, 0xc7, 0xfb, 0x11, 0x73, 0xcd, 0xe9, 0x2e, 0x6a, 0xc0, 0xaa, 0x67, 0xfa,
0xd8, 0x61, 0x8d, 0x18, 0x81, 0x06, 0x3c, 0x57, 0xe3, 0xfd, 0xf8, 0xef, 0x9b, 0xf2, 0xb3, 0xd8,
0x64, 0xe2, 0x7a, 0xd8, 0x89, 0xe0, 0xb4, 0xda, 0x72, 0x37, 0x2d, 0xd2, 0xc2, 0x94, 0xe9, 0x75,
0xf1, 0x67, 0xac, 0x04, 0xca, 0xfa, 0xf6, 0xa1, 0x57, 0xf0, 0xc0, 0xf5, 0xf8, 0x64, 0x17, 0x4e,
0x0c, 0xcf, 0xf5, 0x49, 0xb3, 0x9d, 0x3e, 0xd2, 0x35, 0xfd, 0x38, 0x50, 0x71, 0xe0, 0x30, 0xbf,
0x67, 0x84, 0x0a, 0xd5, 0x1d, 0x78, 0x18, 0xff, 0xc0, 0x8b, 0xae, 0x8d, 0x7b, 0xb2, 0x61, 0xf2,
0x25, 0x2f, 0xba, 0x4b, 0xd3, 0xee, 0xe2, 0xb0, 0x15, 0x88, 0xcd, 0x4e, 0xea, 0x53, 0x45, 0xfb,
0x0e, 0xd6, 0x87, 0xaf, 0x92, 0xc9, 0xd9, 0x85, 0x42, 0x7f, 0x3a, 0x0b, 0xd3, 0x93, 0x38, 0x4d,
0xc4, 0x31, 0xb5, 0xff, 0x00, 0xb2, 0xa2, 0x43, 0xa3, 0x36, 0xe4, 0x82, 0xc1, 0x02, 0x55, 0x13,
0xfc, 0x1e, 0x1e, 0xcf, 0xd4, 0x8f, 0xa7, 0x07, 0x48, 0xcb, 0x8f, 0x21, 0x2b, 0x26, 0x0d, 0xa4,
0x4f, 0x86, 0x0e, 0x8f, 0x23, 0xea, 0xfa, 0x9d, 0x0e, 0x76, 0xc0, 0x27, 0x6a, 0xd4, 0x82, 0x5c,
0x40, 0xbf, 0x49, 0xd6, 0xdf, 0x19, 0x4c, 0xd4, 0x8f, 0xa6, 0x01, 0x44, 0x96, 0xbf, 0x86, 0xa5,
0x01, 0x9e, 0x47, 0xb5, 0x69, 0xe0, 0x83, 0x5c, 0x31, 0xe3, 0x95, 0x67, 0x90, 0x3e, 0xc4, 0x0c,
0x25, 0x80, 0x06, 0xe7, 0x03, 0x75, 0x73, 0x4a, 0x69, 0x79, 0x47, 0x0b, 0x32, 0xbc, 0x01, 0x24,
0xe5, 0x63, 0x98, 0xfc, 0xd5, 0xea, 0xd4, 0xf2, 0xf2, 0xa2, 0x23, 0xc8, 0x70, 0x3a, 0x47, 0x1f,
0x4e, 0x06, 0xc6, 0x28, 0x7f, 0x6c, 0xce, 0xdb, 0x90, 0xe1, 0x8c, 0x85, 0x12, 0xca, 0xef, 0x2e,
0x57, 0xab, 0x5b, 0x33, 0x20, 0xa4, 0xdd, 0xa7, 0xb0, 0x18, 0x91, 0x5e, 0x52, 0x94, 0x86, 0xd9,
0x71, 0xac, 0x07, 0xc7, 0xf0, 0x40, 0x32, 0x58, 0x52, 0x76, 0x07, 0x89, 0x6e, 0x82, 0xc2, 0xac,
0x20, 0xa9, 0x24, 0x0b, 0x87, 0x99, 0x6c, 0xac, 0xc2, 0x6f, 0x21, 0x17, 0xb0, 0x55, 0xd2, 0xbb,
0xba, 0xc3, 0x69, 0x63, 0x55, 0x5e, 0xc1, 0xd2, 0x00, 0xd7, 0x24, 0xbd, 0xa0, 0x51, 0x24, 0xa7,
0x6e, 0xcf, 0x84, 0x91, 0x39, 0x7c, 0x03, 0x10, 0xeb, 0xf7, 0xdb, 0xef, 0xd0, 0xde, 0xd5, 0x4f,
0x66, 0x03, 0x05, 0x17, 0xef, 0x15, 0xaf, 0xdf, 0x96, 0x16, 0xfe, 0x7a, 0x5b, 0x5a, 0xf8, 0xf1,
0xb6, 0xa4, 0x5c, 0xdf, 0x96, 0x94, 0x3f, 0x6e, 0x4b, 0xca, 0xbf, 0xb7, 0x25, 0xe5, 0x2c, 0x27,
0x82, 0xb3, 0xfd, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x3d, 0xe6, 0xfc, 0x90, 0x10, 0x00,
0x00,
// 1183 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x4f, 0xe3, 0x46,
0x14, 0xc7, 0xf9, 0x22, 0xbc, 0x00, 0x0b, 0x53, 0x16, 0x65, 0xdd, 0x55, 0x82, 0x7c, 0x69, 0xba,
0x2a, 0x4e, 0x09, 0x3d, 0x54, 0xa8, 0x52, 0x17, 0x08, 0x4b, 0xe9, 0x87, 0xa0, 0x66, 0x4f, 0xdb,
0x4a, 0x91, 0x89, 0x87, 0x30, 0x8a, 0x63, 0x7b, 0x3d, 0x13, 0x96, 0xf4, 0xd4, 0x53, 0xaf, 0xed,
0x5f, 0xd0, 0x3f, 0xa4, 0xe7, 0x1e, 0x38, 0xf6, 0xd0, 0x43, 0xd5, 0x03, 0xed, 0xd2, 0x7f, 0xa4,
0x9a, 0xf1, 0xc4, 0x71, 0x3e, 0x9d, 0x6c, 0xb8, 0x24, 0x33, 0xcf, 0xef, 0xbd, 0x79, 0xdf, 0xbf,
0x07, 0xc7, 0x0d, 0xc2, 0xae, 0xda, 0x17, 0x7a, 0xdd, 0x6d, 0x95, 0xeb, 0xae, 0xc3, 0x4c, 0xe2,
0x60, 0xdf, 0x8a, 0x1e, 0x4d, 0x8f, 0x94, 0x29, 0xf6, 0xaf, 0x49, 0x1d, 0xd3, 0x32, 0xbe, 0xc1,
0xf5, 0x36, 0x23, 0xae, 0xd3, 0x3b, 0xe9, 0x9e, 0xef, 0x32, 0x17, 0x3d, 0xed, 0x89, 0xe8, 0x5d,
0x76, 0x9d, 0x99, 0xb4, 0x49, 0xf5, 0xeb, 0x1d, 0xf5, 0xfd, 0x86, 0xeb, 0x36, 0x6c, 0x5c, 0x16,
0xbc, 0x17, 0xed, 0xcb, 0x32, 0x6e, 0x79, 0xac, 0x13, 0x88, 0xaa, 0x4f, 0x06, 0x3f, 0x9a, 0x4e,
0xf7, 0xd3, 0x46, 0xc3, 0x6d, 0xb8, 0xe2, 0x58, 0xe6, 0x27, 0x49, 0xfd, 0x6c, 0x2a, 0xa3, 0x59,
0xc7, 0xc3, 0xb4, 0xdc, 0x72, 0xdb, 0x0e, 0x0b, 0x7e, 0xa5, 0xf4, 0x8b, 0x19, 0xa4, 0x2d, 0x4c,
0xeb, 0x3e, 0xf1, 0x98, 0xeb, 0x47, 0x8e, 0x52, 0xcf, 0xde, 0x0c, 0x7a, 0x78, 0x20, 0xc4, 0x8f,
0x94, 0x2d, 0x0e, 0xba, 0xcc, 0x48, 0x0b, 0x53, 0x66, 0xb6, 0xbc, 0x80, 0x41, 0xfb, 0x35, 0x01,
0xeb, 0x87, 0x3e, 0x36, 0x19, 0x7e, 0x69, 0xd2, 0xa6, 0x81, 0x5f, 0xb7, 0x31, 0x65, 0xa8, 0x02,
0xcb, 0xa1, 0xfa, 0x1a, 0xb1, 0xf2, 0x89, 0x2d, 0xa5, 0xb4, 0x74, 0xf0, 0xe8, 0xfe, 0xae, 0x98,
0x3b, 0xec, 0xd2, 0x4f, 0xaa, 0x46, 0x2e, 0x64, 0x3a, 0xb1, 0x50, 0x05, 0x32, 0xbe, 0xeb, 0xb2,
0x4b, 0x9a, 0x4f, 0x6e, 0x25, 0x4b, 0xb9, 0x8a, 0xaa, 0x47, 0x32, 0x75, 0xbd, 0xa3, 0x0b, 0x03,
0xf5, 0x6f, 0x78, 0x80, 0x0c, 0xc9, 0x89, 0x36, 0x20, 0x4d, 0x99, 0x45, 0x9c, 0x7c, 0x8a, 0x3f,
0x60, 0x04, 0x17, 0xb4, 0x09, 0x19, 0xca, 0x2c, 0xb7, 0xcd, 0xf2, 0x69, 0x41, 0x96, 0x37, 0x49,
0xc7, 0xbe, 0x9f, 0xcf, 0x84, 0x74, 0xec, 0xfb, 0x48, 0x85, 0x2c, 0xc3, 0x7e, 0x8b, 0x38, 0xa6,
0x9d, 0x5f, 0xdc, 0x52, 0x4a, 0x59, 0x23, 0xbc, 0xa3, 0xcf, 0x01, 0xea, 0x57, 0xb8, 0xde, 0xf4,
0x5c, 0xe2, 0xb0, 0x7c, 0x76, 0x4b, 0x29, 0xe5, 0x2a, 0xc5, 0x91, 0x96, 0x55, 0xc3, 0xb8, 0x1b,
0x11, 0x11, 0xed, 0x15, 0xa0, 0x68, 0x7c, 0xa8, 0xe7, 0x3a, 0x14, 0xbf, 0x53, 0x80, 0xd6, 0x20,
0xe9, 0x11, 0x2b, 0x9f, 0xdc, 0x52, 0x4a, 0x2b, 0x06, 0x3f, 0x6a, 0x2f, 0x60, 0xed, 0x9c, 0x99,
0x3e, 0x9b, 0x14, 0x7a, 0x25, 0x5e, 0xb3, 0x76, 0x0c, 0xeb, 0x55, 0x6c, 0xe3, 0xc9, 0x39, 0x9c,
0x46, 0xd1, 0x6f, 0x0a, 0xac, 0x06, 0x9a, 0xc6, 0x7a, 0xaa, 0x4c, 0xef, 0x69, 0x22, 0xf4, 0x14,
0x15, 0x21, 0x87, 0x6f, 0x08, 0xab, 0x51, 0x66, 0xb2, 0x36, 0x95, 0x31, 0x00, 0x4e, 0x3a, 0x17,
0x14, 0xb4, 0x0f, 0x4b, 0xfc, 0x86, 0xad, 0x9a, 0xc9, 0x44, 0x35, 0xf0, 0x02, 0x0a, 0x8a, 0x57,
0xef, 0x16, 0xaf, 0xfe, 0xb2, 0x5b, 0xbc, 0x07, 0xd9, 0xdb, 0xbb, 0xe2, 0xc2, 0x2f, 0xff, 0x14,
0x15, 0x23, 0x1b, 0x88, 0xed, 0x33, 0xed, 0x7b, 0xd8, 0x08, 0x6c, 0x3f, 0xf3, 0xdd, 0x3a, 0xa6,
0x74, 0x8e, 0x40, 0x0c, 0x7b, 0xa0, 0x55, 0x61, 0xf5, 0x18, 0xcf, 0x9d, 0xa9, 0xe7, 0xf0, 0x28,
0xd4, 0x22, 0x03, 0xbc, 0x0d, 0x29, 0xde, 0xb0, 0x42, 0x3c, 0x57, 0x79, 0x32, 0xb2, 0x36, 0x85,
0x80, 0x60, 0xd3, 0x9e, 0xc1, 0xda, 0xd7, 0x84, 0x0a, 0x15, 0xa1, 0x87, 0x9b, 0x90, 0xb9, 0x24,
0x36, 0xc3, 0x7e, 0x60, 0x83, 0x21, 0x6f, 0x5a, 0x15, 0xd6, 0x23, 0xbc, 0xf2, 0xbd, 0x32, 0xa4,
0xc5, 0xb8, 0xcc, 0x2b, 0xa2, 0x4d, 0x27, 0x3c, 0x18, 0xf0, 0x69, 0x3f, 0x2b, 0x90, 0xfb, 0x8a,
0xd8, 0xf6, 0x3c, 0xf1, 0xe4, 0xad, 0x4b, 0x1a, 0xbc, 0x41, 0x83, 0x90, 0xca, 0x1b, 0x42, 0x90,
0x34, 0x6d, 0x5b, 0xd4, 0x43, 0xf6, 0x8b, 0x05, 0x83, 0x5f, 0x38, 0x8d, 0xc7, 0x9e, 0x17, 0xc1,
0x0a, 0xa7, 0x79, 0xc4, 0x3a, 0x58, 0x06, 0xf0, 0x88, 0x55, 0x73, 0xfd, 0x9a, 0x69, 0xdb, 0xda,
0x9f, 0x0a, 0xa0, 0xa3, 0x1b, 0x5c, 0x7f, 0x80, 0x44, 0x87, 0x13, 0x28, 0x31, 0x7a, 0x02, 0x25,
0xc7, 0x4c, 0xa0, 0xd4, 0xd8, 0x09, 0x94, 0x1e, 0x98, 0x40, 0x25, 0x48, 0x51, 0x0f, 0xd7, 0xc5,
0xcc, 0xca, 0x55, 0x36, 0x86, 0x8a, 0x7a, 0xdf, 0xe9, 0x18, 0x82, 0x43, 0xfb, 0x00, 0xde, 0xeb,
0xf3, 0x4a, 0x26, 0x4c, 0xd6, 0xa2, 0xd2, 0xab, 0xc5, 0x9f, 0x14, 0x58, 0x33, 0x30, 0x25, 0x3f,
0xe0, 0x33, 0xd6, 0x79, 0xd0, 0x32, 0xe7, 0xf1, 0x78, 0x43, 0x2c, 0x76, 0x25, 0x5b, 0x34, 0xb8,
0x70, 0xbf, 0xaf, 0x30, 0x69, 0x5c, 0x05, 0xad, 0xb9, 0x62, 0xc8, 0x9b, 0x66, 0xc3, 0xea, 0xa1,
0xed, 0x52, 0x7c, 0x72, 0xfa, 0xe0, 0x56, 0x04, 0x59, 0x11, 0x85, 0x21, 0xb3, 0xc2, 0xc7, 0xe5,
0x99, 0xd9, 0xa6, 0xf8, 0x01, 0xc6, 0xa5, 0x81, 0x69, 0xbb, 0x35, 0xb7, 0xa2, 0x2f, 0x61, 0x83,
0xf7, 0x97, 0x4c, 0x18, 0x9e, 0xa7, 0x10, 0xb5, 0x73, 0x78, 0x3c, 0xa0, 0x4b, 0xa6, 0x7f, 0x0f,
0x96, 0xbc, 0x2e, 0x51, 0xf6, 0xec, 0xd3, 0x91, 0x3d, 0xdb, 0xad, 0x9b, 0x1e, 0xbb, 0xf6, 0x7b,
0x02, 0x1e, 0x1f, 0x86, 0x58, 0x36, 0xa7, 0xbb, 0xa8, 0x06, 0xeb, 0x9e, 0xe9, 0x63, 0x87, 0xd5,
0x22, 0x90, 0x1a, 0x20, 0x5f, 0x85, 0xcf, 0xe3, 0xbf, 0xef, 0x8a, 0xcf, 0x22, 0xbb, 0x8a, 0xeb,
0x61, 0x27, 0x14, 0xa7, 0xe5, 0x86, 0xbb, 0x6d, 0x91, 0x06, 0xa6, 0x4c, 0xaf, 0x8a, 0x3f, 0x63,
0x2d, 0x50, 0xd6, 0xb3, 0x0f, 0xbd, 0x82, 0x45, 0xd7, 0xe3, 0xbb, 0x5e, 0x77, 0x87, 0x78, 0xae,
0x4f, 0xda, 0xf6, 0xf4, 0x91, 0xae, 0xe9, 0xa7, 0x81, 0x8a, 0x23, 0x87, 0xf9, 0x1d, 0xa3, 0xab,
0x50, 0xdd, 0x83, 0xe5, 0xe8, 0x07, 0x5e, 0x74, 0x4d, 0xdc, 0x91, 0x03, 0x93, 0x1f, 0x79, 0xd1,
0x5d, 0x9b, 0x76, 0x1b, 0x77, 0x47, 0x81, 0xb8, 0xec, 0x25, 0x3e, 0x55, 0xb4, 0xef, 0x60, 0x73,
0xf0, 0x29, 0x99, 0x9c, 0x7d, 0xc8, 0xf5, 0xf6, 0xb5, 0x6e, 0x7a, 0x62, 0xf7, 0x8b, 0xa8, 0x4c,
0xe5, 0x3f, 0x80, 0xb4, 0x98, 0xd0, 0xa8, 0x09, 0x99, 0x60, 0xd5, 0x40, 0xe5, 0x18, 0xbf, 0x07,
0x17, 0x36, 0xf5, 0xe3, 0xe9, 0x05, 0xa4, 0xe5, 0xa7, 0x90, 0x16, 0xbb, 0x07, 0xd2, 0x27, 0x8b,
0x0e, 0x2e, 0x28, 0xea, 0xe6, 0xd0, 0x04, 0x3b, 0xe2, 0x3b, 0x36, 0x6a, 0x40, 0x26, 0x80, 0xdf,
0x38, 0xeb, 0x87, 0x56, 0x15, 0xf5, 0xa3, 0x69, 0x04, 0x42, 0xcb, 0x5f, 0xc3, 0x4a, 0x1f, 0xce,
0xa3, 0xca, 0x34, 0xe2, 0xfd, 0x58, 0x31, 0xe3, 0x93, 0x17, 0x90, 0x3c, 0xc6, 0x0c, 0xc5, 0x08,
0xf5, 0xef, 0x07, 0xea, 0xf6, 0x94, 0xdc, 0xf2, 0x8d, 0x06, 0xa4, 0xf8, 0x00, 0x88, 0xcb, 0xc7,
0x20, 0xf8, 0xab, 0xe5, 0xa9, 0xf9, 0xe5, 0x43, 0x27, 0x90, 0xe2, 0x70, 0x8e, 0x3e, 0x9c, 0x2c,
0x18, 0x81, 0xfc, 0xb1, 0x39, 0x6f, 0x42, 0x8a, 0x23, 0x16, 0x8a, 0x29, 0xbf, 0x61, 0xac, 0x56,
0x77, 0x66, 0x90, 0x90, 0x76, 0x9f, 0xc3, 0x52, 0x08, 0x7a, 0x71, 0x51, 0x1a, 0x44, 0xc7, 0xb1,
0x1e, 0x9c, 0xc2, 0xa2, 0x44, 0xb0, 0xb8, 0xec, 0xf6, 0x03, 0xdd, 0x04, 0x85, 0x69, 0x01, 0x52,
0x71, 0x16, 0x0e, 0x22, 0xd9, 0x58, 0x85, 0xdf, 0x42, 0x26, 0x40, 0xab, 0xb8, 0xbe, 0x1a, 0xc2,
0xb4, 0xb1, 0x2a, 0x6f, 0x60, 0xa5, 0x0f, 0x6b, 0xe2, 0x3a, 0x68, 0x14, 0xc8, 0xa9, 0xbb, 0x33,
0xc9, 0xc8, 0x1c, 0xbe, 0x01, 0x88, 0xcc, 0xfb, 0xdd, 0x77, 0x18, 0xef, 0xea, 0x27, 0xb3, 0x09,
0x05, 0x0f, 0x1f, 0xe4, 0x6f, 0xdf, 0x16, 0x16, 0xfe, 0x7a, 0x5b, 0x58, 0xf8, 0xf1, 0xbe, 0xa0,
0xdc, 0xde, 0x17, 0x94, 0x3f, 0xee, 0x0b, 0xca, 0xbf, 0xf7, 0x05, 0xe5, 0x22, 0x23, 0x82, 0xb3,
0xfb, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x2e, 0x03, 0x28, 0xa2, 0x10, 0x00, 0x00,
}

5
api/services/execution/execution.proto
View File

@ -94,8 +94,9 @@ message DeleteTaskRequest {
message DeleteResponse {
string container_id = 1;
uint32 exit_status = 2;
google.protobuf.Timestamp exited_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
uint32 pid = 2;
uint32 exit_status = 3;
google.protobuf.Timestamp exited_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
}
message DeleteProcessRequest {

179
api/services/shim/shim.pb.go
View File

@ -111,8 +111,9 @@ func (*DeleteRequest) ProtoMessage() {}
func (*DeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{3} }
type DeleteResponse struct {
ExitStatus uint32 `protobuf:"varint,1,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,2,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
ExitStatus uint32 `protobuf:"varint,2,opt,name=exit_status,json=exitStatus,proto3" json:"exit_status,omitempty"`
ExitedAt time.Time `protobuf:"bytes,3,opt,name=exited_at,json=exitedAt,stdtime" json:"exited_at"`
}
func (m *DeleteResponse) Reset() { *m = DeleteResponse{} }
@ -1019,12 +1020,17 @@ func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) {
_ = i
var l int
_ = l
if m.ExitStatus != 0 {
if m.Pid != 0 {
dAtA[i] = 0x8
i++
i = encodeVarintShim(dAtA, i, uint64(m.Pid))
}
if m.ExitStatus != 0 {
dAtA[i] = 0x10
i++
i = encodeVarintShim(dAtA, i, uint64(m.ExitStatus))
}
dAtA[i] = 0x12
dAtA[i] = 0x1a
i++
i = encodeVarintShim(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt)))
n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i:])
@ -1631,6 +1637,9 @@ func (m *DeleteRequest) Size() (n int) {
func (m *DeleteResponse) Size() (n int) {
var l int
_ = l
if m.Pid != 0 {
n += 1 + sovShim(uint64(m.Pid))
}
if m.ExitStatus != 0 {
n += 1 + sovShim(uint64(m.ExitStatus))
}
@ -1914,6 +1923,7 @@ func (this *DeleteResponse) String() string {
return "nil"
}
s := strings.Join([]string{`&DeleteResponse{`,
`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
`ExitStatus:` + fmt.Sprintf("%v", this.ExitStatus) + `,`,
`ExitedAt:` + strings.Replace(strings.Replace(this.ExitedAt.String(), "Timestamp", "google_protobuf3.Timestamp", 1), `&`, ``, 1) + `,`,
`}`,
@ -2664,6 +2674,25 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
}
switch fieldNum {
case 1:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Pid", wireType)
}
m.Pid = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowShim
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.Pid |= (uint32(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
case 2:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ExitStatus", wireType)
}
@ -2682,7 +2711,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error {
break
}
}
case 2:
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ExitedAt", wireType)
}
@ -4461,75 +4490,75 @@ func init() {
}
var fileDescriptorShim = []byte{
// 1110 bytes of a gzipped FileDescriptorProto
// 1114 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6f, 0xe3, 0x44,
0x14, 0x5f, 0x27, 0x69, 0x9a, 0xbc, 0x34, 0xa5, 0x1d, 0x55, 0x95, 0xd7, 0x8b, 0xd2, 0xca, 0x12,
0x52, 0xc5, 0x87, 0xb3, 0x9b, 0x4a, 0x08, 0x55, 0x20, 0xd1, 0xaf, 0xc3, 0x6a, 0x59, 0x35, 0xb8,
0x48, 0x08, 0x2e, 0x95, 0x9b, 0x4c, 0xe3, 0x51, 0x6d, 0x8f, 0xf1, 0x8c, 0x43, 0x73, 0xe3, 0x4f,
0x80, 0x23, 0x77, 0xfe, 0x0f, 0xae, 0x3d, 0x72, 0x83, 0xd3, 0xc2, 0xf6, 0x2f, 0x41, 0xf3, 0x61,
0xc7, 0x69, 0x6b, 0xea, 0xae, 0xb8, 0x58, 0xf3, 0xde, 0xbc, 0x79, 0x9f, 0xbf, 0xf7, 0x9e, 0xe1,
0x8b, 0x09, 0xe1, 0x7e, 0x7a, 0xee, 0x8c, 0x68, 0xd8, 0x1f, 0xd1, 0x88, 0x7b, 0x24, 0xc2, 0xc9,
0xb8, 0x78, 0xf4, 0x62, 0xd2, 0x67, 0x38, 0x99, 0x92, 0x11, 0x66, 0x7d, 0xe6, 0x93, 0x50, 0x7e,
0x9c, 0x38, 0xa1, 0x9c, 0xa2, 0xed, 0xb9, 0xa0, 0x93, 0xa4, 0x11, 0x27, 0x21, 0x76, 0x02, 0x12,
0xa5, 0x57, 0x8e, 0x14, 0x9a, 0xbe, 0xb0, 0x9e, 0x4e, 0x28, 0x9d, 0x04, 0xb8, 0x2f, 0xe5, 0xcf,
0xd3, 0x8b, 0xbe, 0x17, 0xcd, 0xd4, 0x63, 0xeb, 0xd9, 0xed, 0x2b, 0x1c, 0xc6, 0x3c, 0xbb, 0xdc,
0x98, 0xd0, 0x09, 0x95, 0xc7, 0xbe, 0x38, 0x69, 0xee, 0xe7, 0x95, 0xdc, 0xe5, 0xb3, 0x18, 0xb3,
0x7e, 0x48, 0xd3, 0x88, 0xab, 0xaf, 0x7e, 0xbd, 0xf7, 0x88, 0xd7, 0xdc, 0x63, 0x97, 0xf2, 0xa3,
0xdf, 0x6e, 0xdd, 0x76, 0x56, 0xc4, 0xca, 0xb8, 0x17, 0xc6, 0x4a, 0xc0, 0xfe, 0xb3, 0x06, 0xdd,
0xc3, 0x04, 0x7b, 0x1c, 0xbb, 0xf8, 0x87, 0x14, 0x33, 0x8e, 0x36, 0xa1, 0x46, 0xc6, 0xa6, 0xb1,
0x6d, 0xec, 0xb4, 0x0f, 0x9a, 0x37, 0x6f, 0xb6, 0x6a, 0x2f, 0x8f, 0xdc, 0x1a, 0x19, 0xa3, 0x4d,
0x68, 0x9e, 0xa7, 0xd1, 0x38, 0xc0, 0x66, 0x4d, 0xdc, 0xb9, 0x9a, 0x42, 0x26, 0x2c, 0xeb, 0x1c,
0x9a, 0x75, 0x79, 0x91, 0x91, 0xe8, 0x29, 0xb4, 0x22, 0x7a, 0x16, 0x93, 0x29, 0xe5, 0x66, 0x63,
0xdb, 0xd8, 0x69, 0xb9, 0xcb, 0x11, 0x1d, 0x0a, 0x12, 0x59, 0xd0, 0xe2, 0x38, 0x09, 0x49, 0xe4,
0x05, 0xe6, 0x92, 0xbc, 0xca, 0x69, 0xb4, 0x01, 0x4b, 0x8c, 0x8f, 0x49, 0x64, 0x36, 0xa5, 0x3a,
0x45, 0x08, 0xf3, 0x8c, 0x8f, 0x69, 0xca, 0xcd, 0x65, 0x65, 0x5e, 0x51, 0x9a, 0x8f, 0x93, 0xc4,
0x6c, 0xe5, 0x7c, 0x9c, 0x24, 0x68, 0x00, 0xcd, 0x84, 0x52, 0x7e, 0xc1, 0xcc, 0xf6, 0x76, 0x7d,
0xa7, 0x33, 0xb0, 0x9c, 0x42, 0xd1, 0xa7, 0x2f, 0x1c, 0x99, 0x2f, 0xe7, 0xb5, 0xc8, 0xb3, 0xab,
0x25, 0x51, 0x0f, 0x60, 0xe4, 0xe3, 0xd1, 0x65, 0x4c, 0x49, 0xc4, 0x4d, 0x90, 0xfa, 0x0a, 0x1c,
0xf4, 0x11, 0xac, 0xc7, 0x5e, 0x82, 0x23, 0x7e, 0x56, 0x10, 0xeb, 0x48, 0xb1, 0x35, 0x75, 0x71,
0x98, 0xf3, 0x6d, 0x1b, 0x56, 0xb3, 0xc4, 0xb2, 0x98, 0x46, 0x0c, 0xa3, 0x35, 0xa8, 0xc7, 0x3a,
0xb5, 0x5d, 0x57, 0x1c, 0xed, 0x55, 0x58, 0x39, 0xe5, 0x5e, 0xc2, 0x75, 0xee, 0xed, 0xf7, 0xa0,
0x7b, 0x84, 0x03, 0x9c, 0x17, 0xc3, 0xe6, 0xb0, 0x9a, 0x31, 0xb4, 0x92, 0x2d, 0xe8, 0xe0, 0x2b,
0xc2, 0xcf, 0x18, 0xf7, 0x78, 0xca, 0xb4, 0x32, 0x10, 0xac, 0x53, 0xc9, 0x41, 0xfb, 0xd0, 0x16,
0x14, 0x1e, 0x9f, 0x79, 0x5c, 0x96, 0x4a, 0xc4, 0xae, 0x60, 0xe0, 0x64, 0x30, 0x70, 0xbe, 0xc9,
0x60, 0x70, 0xd0, 0xba, 0x7e, 0xb3, 0xf5, 0xe4, 0xe7, 0xbf, 0xb7, 0x0c, 0xb7, 0xa5, 0x9e, 0xed,
0x73, 0x7b, 0x07, 0x36, 0x94, 0xd5, 0x61, 0x42, 0x47, 0x98, 0xb1, 0x0c, 0x1a, 0x77, 0x03, 0xf8,
0xd5, 0x80, 0xce, 0xf1, 0x15, 0x1e, 0x65, 0x12, 0xc5, 0xba, 0x1a, 0x65, 0x75, 0xad, 0xdd, 0x5f,
0xd7, 0x7a, 0x49, 0x5d, 0x1b, 0x0b, 0x75, 0xdd, 0x81, 0x06, 0x8b, 0xf1, 0x48, 0xa2, 0xa6, 0x33,
0xd8, 0xb8, 0x13, 0xd9, 0x7e, 0x34, 0x73, 0xa5, 0x84, 0x7d, 0x04, 0x4d, 0x37, 0x20, 0x21, 0xe1,
0x08, 0x41, 0x43, 0x94, 0x5b, 0x81, 0xda, 0x95, 0x67, 0xc1, 0xf3, 0xbd, 0x64, 0x2c, 0x9d, 0x69,
0xb8, 0xf2, 0x2c, 0x78, 0x8c, 0x5e, 0x28, 0x4f, 0x1a, 0xae, 0x3c, 0xdb, 0xdb, 0xb0, 0xa2, 0x02,
0x2c, 0x2d, 0xe2, 0x57, 0x00, 0x43, 0x3e, 0x2b, 0xcd, 0x91, 0x88, 0xfb, 0x47, 0x32, 0xe6, 0xbe,
0x34, 0xd5, 0x75, 0x15, 0x21, 0xe2, 0xf3, 0x31, 0x99, 0xf8, 0xca, 0x5a, 0xd7, 0xd5, 0x94, 0x80,
0xc0, 0xf1, 0x14, 0x47, 0x3c, 0x4b, 0xba, 0xc6, 0xc8, 0x1c, 0x12, 0xbf, 0xd5, 0xa0, 0xab, 0x19,
0xda, 0xa5, 0xc7, 0x76, 0xac, 0x76, 0xb1, 0x3e, 0x77, 0x71, 0x57, 0x24, 0x5b, 0xe2, 0x49, 0x24,
0x7b, 0x75, 0xf0, 0xec, 0xde, 0x66, 0x51, 0x00, 0x73, 0xb5, 0x28, 0xda, 0x83, 0x76, 0xac, 0xf0,
0x81, 0x99, 0xb9, 0x24, 0x9b, 0xec, 0xfd, 0x7b, 0xdf, 0x65, 0x28, 0x9a, 0x8b, 0xff, 0x4f, 0x3d,
0x5e, 0x44, 0x5b, 0x7b, 0x11, 0x6d, 0x22, 0x6d, 0x43, 0x2f, 0x65, 0xb8, 0xd0, 0x5a, 0x2e, 0x66,
0x69, 0x98, 0x33, 0xba, 0x02, 0xb9, 0x24, 0x6f, 0xbd, 0x97, 0xd0, 0x79, 0x45, 0x82, 0x60, 0x3e,
0x05, 0x9b, 0x8c, 0x4c, 0x32, 0x18, 0x77, 0x5d, 0x4d, 0x89, 0xdc, 0x79, 0x41, 0x20, 0x13, 0xda,
0x72, 0xc5, 0xf1, 0x6e, 0x36, 0xed, 0x0f, 0x60, 0xfd, 0x30, 0xa0, 0x0c, 0x9f, 0x8a, 0xa0, 0xca,
0x7b, 0xe7, 0x43, 0x58, 0x1b, 0x66, 0x09, 0x79, 0x60, 0xf8, 0xda, 0x27, 0xb0, 0x5e, 0x90, 0xd5,
0x75, 0x5f, 0x28, 0x80, 0xf1, 0xa8, 0x02, 0xd8, 0xbf, 0x1b, 0xb0, 0x3e, 0x1f, 0x56, 0x99, 0x79,
0x04, 0x8d, 0xd8, 0xe3, 0x7e, 0xd6, 0x28, 0xe2, 0x8c, 0xbe, 0x87, 0x65, 0x1a, 0x73, 0x42, 0x23,
0x66, 0xd6, 0xa4, 0x8d, 0x2f, 0x9d, 0x87, 0xd6, 0xa7, 0x73, 0x47, 0xb3, 0x73, 0xa2, 0x54, 0x1c,
0x47, 0x3c, 0x99, 0xb9, 0x99, 0x42, 0x6b, 0x0f, 0x56, 0x8a, 0x17, 0x22, 0x49, 0x97, 0x78, 0xa6,
0xcd, 0x8b, 0xa3, 0x00, 0xca, 0xd4, 0x0b, 0xd2, 0x0c, 0xc2, 0x8a, 0xd8, 0xab, 0x7d, 0x66, 0x0c,
0x7e, 0xe9, 0x40, 0xe3, 0xd4, 0x27, 0x21, 0xba, 0x84, 0xa6, 0x1a, 0xb4, 0xa8, 0x5f, 0xc1, 0xb3,
0xe2, 0xae, 0xb3, 0x9e, 0x57, 0x7f, 0xa0, 0x73, 0x7e, 0x02, 0x4b, 0x72, 0x62, 0x23, 0xe7, 0xe1,
0xa7, 0xc5, 0xd1, 0x6e, 0x6d, 0xde, 0x99, 0x54, 0xc7, 0xe2, 0xbf, 0x41, 0x78, 0xaf, 0x66, 0x6d,
0x15, 0xef, 0x17, 0x96, 0x43, 0x15, 0xef, 0x6f, 0x2d, 0x8f, 0x59, 0xb6, 0x5f, 0x34, 0x22, 0xd0,
0xa7, 0x55, 0x55, 0x2c, 0x6e, 0x82, 0x77, 0x30, 0xed, 0xcb, 0xc4, 0x71, 0x5c, 0x31, 0x71, 0xf3,
0x28, 0xfb, 0x95, 0xe5, 0xb5, 0x25, 0x0e, 0xed, 0xbc, 0x57, 0xd0, 0xe0, 0xe1, 0xd7, 0xb7, 0x9b,
0xd0, 0xda, 0x7d, 0xd4, 0x9b, 0x39, 0x30, 0xe4, 0xbc, 0xa9, 0x12, 0x5f, 0x71, 0x30, 0x95, 0x02,
0xe3, 0x6b, 0x68, 0xaa, 0x81, 0x55, 0x05, 0x18, 0x0b, 0xa3, 0xad, 0x54, 0xe5, 0x77, 0x00, 0xf3,
0xce, 0x44, 0xbb, 0xef, 0xd0, 0xc7, 0xa5, 0xaa, 0x5f, 0x43, 0x43, 0x4c, 0x53, 0xf4, 0xc9, 0xc3,
0x4a, 0x0b, 0x53, 0xb7, 0x54, 0xdd, 0xb7, 0xd0, 0x54, 0x5b, 0xb0, 0x4a, 0xf0, 0x0b, 0xfb, 0xd2,
0xba, 0xff, 0x47, 0x4f, 0xca, 0x3c, 0x37, 0x84, 0x9f, 0x62, 0xcc, 0x57, 0xf1, 0xb3, 0xb0, 0x0e,
0x4a, 0xfd, 0xc4, 0x22, 0x6c, 0x3c, 0xaa, 0x16, 0x76, 0xfe, 0x9b, 0x64, 0x39, 0x55, 0xc5, 0x35,
0xb8, 0x5e, 0x41, 0x7d, 0xc8, 0x67, 0xe8, 0xe3, 0x0a, 0xd0, 0xca, 0xff, 0x44, 0xfe, 0x13, 0x05,
0xf9, 0x7a, 0xaa, 0x84, 0x82, 0xdb, 0xcb, 0xac, 0x4c, 0xf5, 0x81, 0x79, 0xfd, 0xb6, 0xf7, 0xe4,
0xaf, 0xb7, 0xbd, 0x27, 0x3f, 0xdd, 0xf4, 0x8c, 0xeb, 0x9b, 0x9e, 0xf1, 0xc7, 0x4d, 0xcf, 0xf8,
0xe7, 0xa6, 0x67, 0x9c, 0x37, 0xa5, 0xe4, 0xee, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd3, 0x47,
0xdf, 0xa8, 0xba, 0x0d, 0x00, 0x00,
0x14, 0xaf, 0x93, 0x34, 0x4d, 0x5e, 0x9a, 0xd2, 0x8e, 0xaa, 0xca, 0x9b, 0x45, 0x69, 0x65, 0x09,
0xa9, 0xe2, 0xc3, 0xd9, 0x4d, 0x25, 0x84, 0x2a, 0x90, 0xe8, 0xd7, 0x61, 0xb5, 0xac, 0x1a, 0x5c,
0x24, 0x04, 0x97, 0xca, 0x4d, 0xa6, 0xf1, 0xa8, 0xb6, 0xc7, 0x78, 0xc6, 0xa1, 0xb9, 0x71, 0xe2,
0x0c, 0x47, 0xee, 0xfc, 0x1f, 0x5c, 0x7b, 0xe4, 0x06, 0xa7, 0x85, 0xed, 0x5f, 0x82, 0xe6, 0xc3,
0x8e, 0xd3, 0xd6, 0xc4, 0x5d, 0xed, 0xc5, 0x9a, 0xf7, 0xe6, 0xbd, 0x37, 0xef, 0xe3, 0xf7, 0xde,
0x33, 0x7c, 0x31, 0x26, 0xdc, 0x4b, 0x2e, 0xec, 0x21, 0x0d, 0x7a, 0x43, 0x1a, 0x72, 0x97, 0x84,
0x38, 0x1e, 0xe5, 0x8f, 0x6e, 0x44, 0x7a, 0x0c, 0xc7, 0x13, 0x32, 0xc4, 0xac, 0xc7, 0x3c, 0x12,
0xc8, 0x8f, 0x1d, 0xc5, 0x94, 0x53, 0xb4, 0x33, 0x13, 0xb4, 0xe3, 0x24, 0xe4, 0x24, 0xc0, 0xb6,
0x4f, 0xc2, 0xe4, 0xda, 0x96, 0x42, 0x93, 0xe7, 0x9d, 0x27, 0x63, 0x4a, 0xc7, 0x3e, 0xee, 0x49,
0xf9, 0x8b, 0xe4, 0xb2, 0xe7, 0x86, 0x53, 0xa5, 0xdc, 0x79, 0x7a, 0xf7, 0x0a, 0x07, 0x11, 0x4f,
0x2f, 0x37, 0xc7, 0x74, 0x4c, 0xe5, 0xb1, 0x27, 0x4e, 0x9a, 0xfb, 0x79, 0x29, 0x77, 0xf9, 0x34,
0xc2, 0xac, 0x17, 0xd0, 0x24, 0xe4, 0xea, 0xab, 0xb5, 0xf7, 0x1f, 0xa1, 0xcd, 0x5d, 0x76, 0x25,
0x3f, 0x5a, 0x77, 0xfb, 0xae, 0xb3, 0x22, 0x56, 0xc6, 0xdd, 0x20, 0x52, 0x02, 0xd6, 0x5f, 0x15,
0x68, 0x1f, 0xc5, 0xd8, 0xe5, 0xd8, 0xc1, 0x3f, 0x24, 0x98, 0x71, 0xb4, 0x05, 0x15, 0x32, 0x32,
0x8d, 0x1d, 0x63, 0xb7, 0x79, 0x58, 0xbf, 0x7d, 0xbd, 0x5d, 0x79, 0x71, 0xec, 0x54, 0xc8, 0x08,
0x6d, 0x41, 0xfd, 0x22, 0x09, 0x47, 0x3e, 0x36, 0x2b, 0xe2, 0xce, 0xd1, 0x14, 0x32, 0x61, 0x45,
0xe7, 0xd0, 0xac, 0xca, 0x8b, 0x94, 0x44, 0x4f, 0xa0, 0x11, 0xd2, 0xf3, 0x88, 0x4c, 0x28, 0x37,
0x6b, 0x3b, 0xc6, 0x6e, 0xc3, 0x59, 0x09, 0xe9, 0x40, 0x90, 0xa8, 0x03, 0x0d, 0x8e, 0xe3, 0x80,
0x84, 0xae, 0x6f, 0x2e, 0xcb, 0xab, 0x8c, 0x46, 0x9b, 0xb0, 0xcc, 0xf8, 0x88, 0x84, 0x66, 0x5d,
0x9a, 0x53, 0x84, 0x78, 0x9e, 0xf1, 0x11, 0x4d, 0xb8, 0xb9, 0xa2, 0x9e, 0x57, 0x94, 0xe6, 0xe3,
0x38, 0x36, 0x1b, 0x19, 0x1f, 0xc7, 0x31, 0xea, 0x43, 0x3d, 0xa6, 0x94, 0x5f, 0x32, 0xb3, 0xb9,
0x53, 0xdd, 0x6d, 0xf5, 0x3b, 0x76, 0xae, 0xe8, 0x93, 0xe7, 0xb6, 0xcc, 0x97, 0xfd, 0x4a, 0xe4,
0xd9, 0xd1, 0x92, 0xa8, 0x0b, 0x30, 0xf4, 0xf0, 0xf0, 0x2a, 0xa2, 0x24, 0xe4, 0x26, 0x48, 0x7b,
0x39, 0x0e, 0xfa, 0x08, 0x36, 0x22, 0x37, 0xc6, 0x21, 0x3f, 0xcf, 0x89, 0xb5, 0xa4, 0xd8, 0xba,
0xba, 0x38, 0xca, 0xf8, 0x96, 0x05, 0x6b, 0x69, 0x62, 0x59, 0x44, 0x43, 0x86, 0xd1, 0x3a, 0x54,
0x23, 0x9d, 0xda, 0xb6, 0x23, 0x8e, 0xd6, 0x1a, 0xac, 0x9e, 0x71, 0x37, 0xe6, 0x3a, 0xf7, 0xd6,
0x7b, 0xd0, 0x3e, 0xc6, 0x3e, 0xce, 0x8a, 0x61, 0xfd, 0x6c, 0xc0, 0x5a, 0xca, 0x29, 0xb2, 0x82,
0xb6, 0xa1, 0x85, 0xaf, 0x09, 0x3f, 0x67, 0xdc, 0xe5, 0x09, 0x93, 0xe5, 0x69, 0x3b, 0x20, 0x58,
0x67, 0x92, 0x83, 0x0e, 0xa0, 0x29, 0x28, 0x3c, 0x3a, 0x77, 0xb9, 0x2c, 0x92, 0x48, 0x87, 0x42,
0x86, 0x9d, 0x22, 0xc3, 0xfe, 0x26, 0x45, 0xc6, 0x61, 0xe3, 0xe6, 0xf5, 0xf6, 0xd2, 0x2f, 0xff,
0x6c, 0x1b, 0x4e, 0x43, 0xa9, 0x1d, 0x70, 0x6b, 0x17, 0x36, 0x95, 0x1f, 0x83, 0x98, 0x0e, 0x31,
0x63, 0x29, 0x5a, 0xee, 0xc7, 0xf4, 0x9b, 0x01, 0xad, 0x93, 0x6b, 0x3c, 0x4c, 0x25, 0xf2, 0xa5,
0x36, 0x8a, 0x4a, 0x5d, 0x79, 0xb8, 0xd4, 0xd5, 0x82, 0x52, 0xd7, 0xe6, 0x4a, 0xbd, 0x0b, 0x35,
0x16, 0xe1, 0xa1, 0x04, 0x52, 0xab, 0xbf, 0x79, 0x2f, 0xb2, 0x83, 0x70, 0xea, 0x48, 0x09, 0xeb,
0x18, 0xea, 0x8e, 0x4f, 0x02, 0xc2, 0x11, 0x82, 0x9a, 0x40, 0x80, 0xc2, 0xb9, 0x23, 0xcf, 0x82,
0xe7, 0xb9, 0xf1, 0x48, 0x3a, 0x53, 0x73, 0xe4, 0x59, 0xf0, 0x18, 0xbd, 0x54, 0x9e, 0xd4, 0x1c,
0x79, 0xb6, 0x76, 0x60, 0x55, 0x05, 0x58, 0x58, 0xd7, 0xaf, 0x00, 0x06, 0x7c, 0x5a, 0x98, 0x23,
0x11, 0xf7, 0x8f, 0x64, 0xc4, 0x3d, 0x5d, 0x2b, 0x45, 0x88, 0xf8, 0x3c, 0x4c, 0xc6, 0x9e, 0x7a,
0xad, 0xed, 0x68, 0x4a, 0xa0, 0xe2, 0x64, 0x82, 0x43, 0x9e, 0x26, 0x5d, 0xc3, 0x66, 0x86, 0x92,
0xdf, 0x2b, 0xd0, 0xd6, 0x0c, 0xed, 0xd2, 0x63, 0x9b, 0x58, 0xbb, 0x58, 0x9d, 0xb9, 0xb8, 0x27,
0x92, 0x2d, 0xf1, 0x24, 0x92, 0xbd, 0xd6, 0x7f, 0xfa, 0x60, 0xff, 0x28, 0x80, 0x39, 0x5a, 0x14,
0xed, 0x43, 0x33, 0x52, 0xf8, 0xc0, 0xcc, 0x5c, 0x96, 0x7d, 0xf7, 0xfe, 0x83, 0x7a, 0x29, 0x8a,
0x66, 0xe2, 0xef, 0xa8, 0xed, 0xf3, 0x68, 0x6b, 0xce, 0xa3, 0x4d, 0xa4, 0x6d, 0xe0, 0x26, 0x0c,
0xe7, 0xba, 0xcd, 0xc1, 0x2c, 0x09, 0x32, 0x46, 0x5b, 0x20, 0x97, 0x64, 0xdd, 0xf8, 0x02, 0x5a,
0x2f, 0x89, 0xef, 0xcf, 0x06, 0x63, 0x9d, 0x91, 0x71, 0x0a, 0xe3, 0xb6, 0xa3, 0x29, 0x91, 0x3b,
0xd7, 0xf7, 0x65, 0x42, 0x1b, 0x8e, 0x38, 0xde, 0xcf, 0xa6, 0xf5, 0x01, 0x6c, 0x1c, 0xf9, 0x94,
0xe1, 0x33, 0x11, 0x54, 0x71, 0xef, 0x7c, 0x08, 0xeb, 0x83, 0x34, 0x21, 0x0b, 0xe6, 0xb1, 0x75,
0x0a, 0x1b, 0x39, 0x59, 0x5d, 0xf7, 0xb9, 0x02, 0x18, 0x8f, 0x2a, 0x80, 0xf5, 0x87, 0x01, 0x1b,
0xb3, 0xf9, 0x95, 0x3e, 0x8f, 0xa0, 0x16, 0xb9, 0xdc, 0x4b, 0x1b, 0x45, 0x9c, 0xd1, 0xf7, 0xb0,
0x42, 0x23, 0x4e, 0x68, 0x28, 0x86, 0x8d, 0x78, 0xe3, 0x4b, 0x7b, 0xd1, 0x46, 0xb5, 0xef, 0x59,
0xb6, 0x4f, 0x95, 0x89, 0x93, 0x90, 0xc7, 0x53, 0x27, 0x35, 0xd8, 0xd9, 0x87, 0xd5, 0xfc, 0x85,
0x48, 0xd2, 0x15, 0x9e, 0xea, 0xe7, 0xc5, 0x51, 0x00, 0x65, 0xe2, 0xfa, 0x49, 0x0a, 0x61, 0x45,
0xec, 0x57, 0x3e, 0x33, 0xfa, 0xbf, 0xb6, 0xa0, 0x76, 0xe6, 0x91, 0x00, 0x5d, 0x41, 0x5d, 0xcd,
0x5e, 0xd4, 0x2b, 0xe1, 0x59, 0x7e, 0xfd, 0x75, 0x9e, 0x95, 0x57, 0xd0, 0x39, 0x3f, 0x85, 0x65,
0x39, 0xc4, 0x91, 0xbd, 0x58, 0x35, 0x3f, 0xed, 0x3b, 0x5b, 0xf7, 0x26, 0xd5, 0x89, 0xf8, 0x95,
0x10, 0xde, 0xab, 0x59, 0x5b, 0xc6, 0xfb, 0xb9, 0x7d, 0x51, 0xc6, 0xfb, 0x3b, 0xeb, 0x64, 0x9a,
0xae, 0x1c, 0x8d, 0x08, 0xf4, 0x69, 0x59, 0x13, 0xf3, 0x9b, 0xe0, 0x2d, 0x9e, 0xf6, 0x64, 0xe2,
0x38, 0x2e, 0x99, 0xb8, 0x59, 0x94, 0xbd, 0xd2, 0xf2, 0xfa, 0x25, 0x0e, 0xcd, 0xac, 0x57, 0x50,
0x7f, 0xb1, 0xf6, 0xdd, 0x26, 0xec, 0xec, 0x3d, 0x4a, 0x67, 0x06, 0x0c, 0x39, 0x6f, 0xca, 0xc4,
0x97, 0x1f, 0x4c, 0x85, 0xc0, 0xf8, 0x1a, 0xea, 0x6a, 0x60, 0x95, 0x01, 0xc6, 0xdc, 0x68, 0x2b,
0x34, 0xf9, 0x1d, 0xc0, 0xac, 0x33, 0xd1, 0xde, 0x5b, 0xf4, 0x71, 0xa1, 0xe9, 0x57, 0x50, 0x13,
0xd3, 0x14, 0x7d, 0xb2, 0xd8, 0x68, 0x6e, 0xea, 0x16, 0x9a, 0xfb, 0x16, 0xea, 0x6a, 0x0b, 0x96,
0x09, 0x7e, 0x6e, 0x5f, 0x76, 0x1e, 0xfe, 0xf7, 0x93, 0x32, 0xcf, 0x0c, 0xe1, 0xa7, 0x18, 0xf3,
0x65, 0xfc, 0xcc, 0xad, 0x83, 0x42, 0x3f, 0xb1, 0x08, 0x1b, 0x0f, 0xcb, 0x85, 0x9d, 0xfd, 0x26,
0x75, 0xec, 0xb2, 0xe2, 0x1a, 0x5c, 0x2f, 0xa1, 0x3a, 0xe0, 0x53, 0xf4, 0x71, 0x09, 0x68, 0x65,
0x7f, 0x22, 0xff, 0x8b, 0x82, 0x6c, 0x3d, 0x95, 0x42, 0xc1, 0xdd, 0x65, 0x56, 0x64, 0xfa, 0xd0,
0xbc, 0x79, 0xd3, 0x5d, 0xfa, 0xfb, 0x4d, 0x77, 0xe9, 0xa7, 0xdb, 0xae, 0x71, 0x73, 0xdb, 0x35,
0xfe, 0xbc, 0xed, 0x1a, 0xff, 0xde, 0x76, 0x8d, 0x8b, 0xba, 0x94, 0xdc, 0xfb, 0x2f, 0x00, 0x00,
0xff, 0xff, 0xc6, 0xa3, 0x7c, 0xe5, 0xcd, 0x0d, 0x00, 0x00,
}

5
api/services/shim/shim.proto
View File

@ -57,8 +57,9 @@ message DeleteRequest {
}
message DeleteResponse {
uint32 exit_status = 1;
google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
uint32 pid = 1;
uint32 exit_status = 2;
google.protobuf.Timestamp exited_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
}
message DeleteProcessRequest {

4
api/types/event/task.proto
View File

@ -12,6 +12,6 @@ message TaskStart {
message TaskDelete {
string container_id = 1;
uint32 pid = 2;
uint32 exit_status = 3;
uint32 pid = 2;
uint32 exit_status = 3;
}

10
cmd/ctr/run_windows.go
View File

@ -150,16 +150,18 @@ func newCreateContainerRequest(context *cli.Context, id, snapshot, image string,
TypeUrl: specs.Version,
Value: spec,
},
Runtime: context.String("runtime"),
RootFS: snapshot,
Runtime: &containersapi.Container_Runtime{
Name: context.String("runtime"),
},
RootFS: snapshot,
},
}
return create, nil
}
func newCreateTaskRequest(context *cli.Context, id, tmpDir string, checkpoint *ocispec.Descriptor, mounts []mount.Mount) (*execution.CreateRequest, error) {
create := &execution.CreateRequest{
func newCreateTaskRequest(context *cli.Context, id, tmpDir string, checkpoint *ocispec.Descriptor, mounts []mount.Mount) (*execution.CreateTaskRequest, error) {
create := &execution.CreateTaskRequest{
ContainerID: id,
Terminal: context.Bool("tty"),
Stdin: fmt.Sprintf(`%s\ctr-%s-stdin`, pipeRoot, id),

2
linux/runtime.go
View File

@ -298,10 +298,10 @@ func (r *Runtime) Delete(ctx context.Context, c plugin.Task) (*plugin.Exit, erro
}); err != nil {
return nil, err
}
return &plugin.Exit{
Status: rsp.ExitStatus,
Timestamp: rsp.ExitedAt,
Pid: rsp.Pid,
}, r.deleteBundle(namespace, lc.containerID)
}

2
linux/shim/service.go
View File

@ -98,6 +98,7 @@ func (s *Service) Delete(ctx context.Context, r *shimapi.DeleteRequest) (*shimap
return &shimapi.DeleteResponse{
ExitStatus: uint32(p.Status()),
ExitedAt: p.ExitedAt(),
Pid: uint32(p.Pid()),
}, nil
}
@ -119,6 +120,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *shimapi.DeleteProcessReq
return &shimapi.DeleteResponse{
ExitStatus: uint32(p.Status()),
ExitedAt: p.ExitedAt(),
Pid: uint32(p.Pid()),
}, nil
}

1
linux/task.go
View File

@ -186,6 +186,7 @@ func (t *Task) DeleteProcess(ctx context.Context, pid uint32) (*plugin.Exit, err
return &plugin.Exit{
Status: r.ExitStatus,
Timestamp: r.ExitedAt,
Pid: pid,
}, nil
}

1
plugin/runtime.go
View File

@ -25,6 +25,7 @@ type CreateOpts struct {
}
type Exit struct {
Pid uint32
Status uint32
Timestamp time.Time
}

1
process.go
View File

@ -78,6 +78,7 @@ func (p *process) Wait(ctx context.Context) (uint32, error) {
if err != nil {
return UnknownExitStatus, err
}
<-p.pidSync
for {
evt, err := events.Recv()
if err != nil {

10
services/execution/service.go
View File

@ -198,26 +198,21 @@ func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.De
if err != nil {
return nil, err
}
state, err := t.State(ctx)
if err != nil {
return nil, err
}
exit, err := runtime.Delete(ctx, t)
if err != nil {
return nil, err
}
if err := s.emit(ctx, "/tasks/delete", event.TaskDelete{
ContainerID: r.ContainerID,
Pid: state.Pid,
Pid: exit.Pid,
ExitStatus: exit.Status,
}); err != nil {
return nil, err
}
return &api.DeleteResponse{
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
Pid: exit.Pid,
}, nil
}
@ -233,6 +228,7 @@ func (s *Service) DeleteProcess(ctx context.Context, r *api.DeleteProcessRequest
return &api.DeleteResponse{
ExitStatus: exit.Status,
ExitedAt: exit.Timestamp,
Pid: exit.Pid,
}, nil
}

1
task.go
View File

@ -147,6 +147,7 @@ func (t *task) Wait(ctx context.Context) (uint32, error) {
if err != nil {
return UnknownExitStatus, err
}
<-t.pidSync
for {
evt, err := events.Recv()
if err != nil {

2
windows/container.go
View File

@ -190,7 +190,7 @@ func (c *container) Processes(ctx context.Context) ([]uint32, error) {
return pids, nil
}
func (c *container) Checkpoint(ctx context.Context, opts plugin.CheckpointOpts) error {
func (c *container) Checkpoint(ctx context.Context, _ string, _ map[string]string) error {
return fmt.Errorf("Windows containers do not support checkpoint")
}

4
windows/runtime.go
View File

@ -169,10 +169,6 @@ func (r *Runtime) Get(ctx context.Context, id string) (plugin.Task, error) {
return c, nil
}
func (r *Runtime) Events(ctx context.Context) <-chan *plugin.Event {
return r.events
}
func (r *Runtime) sendEvent(id string, evType plugin.EventType, pid, exitStatus uint32, exitedAt time.Time) {
r.events <- &plugin.Event{
Timestamp: time.Now(),