diff --git a/api/services/events/v1/runtime.pb.go b/api/services/events/v1/runtime.pb.go index 82be25879..0104e332b 100644 --- a/api/services/events/v1/runtime.pb.go +++ b/api/services/events/v1/runtime.pb.go @@ -28,12 +28,14 @@ var _ = time.Kitchen type RuntimeEvent_EventType int32 const ( - RuntimeEvent_EXIT RuntimeEvent_EventType = 0 - RuntimeEvent_OOM RuntimeEvent_EventType = 1 - RuntimeEvent_CREATE RuntimeEvent_EventType = 2 - RuntimeEvent_START RuntimeEvent_EventType = 3 - RuntimeEvent_EXEC_ADDED RuntimeEvent_EventType = 4 - RuntimeEvent_PAUSED RuntimeEvent_EventType = 5 + RuntimeEvent_EXIT RuntimeEvent_EventType = 0 + RuntimeEvent_OOM RuntimeEvent_EventType = 1 + RuntimeEvent_CREATE RuntimeEvent_EventType = 2 + RuntimeEvent_START RuntimeEvent_EventType = 3 + RuntimeEvent_EXEC_ADDED RuntimeEvent_EventType = 4 + RuntimeEvent_PAUSED RuntimeEvent_EventType = 5 + RuntimeEvent_RESUMED RuntimeEvent_EventType = 6 + RuntimeEvent_CHECKPOINTED RuntimeEvent_EventType = 7 ) var RuntimeEvent_EventType_name = map[int32]string{ @@ -43,14 +45,18 @@ var RuntimeEvent_EventType_name = map[int32]string{ 3: "START", 4: "EXEC_ADDED", 5: "PAUSED", + 6: "RESUMED", + 7: "CHECKPOINTED", } var RuntimeEvent_EventType_value = map[string]int32{ - "EXIT": 0, - "OOM": 1, - "CREATE": 2, - "START": 3, - "EXEC_ADDED": 4, - "PAUSED": 5, + "EXIT": 0, + "OOM": 1, + "CREATE": 2, + "START": 3, + "EXEC_ADDED": 4, + "PAUSED": 5, + "RESUMED": 6, + "CHECKPOINTED": 7, } func (x RuntimeEvent_EventType) String() string { @@ -1597,45 +1603,47 @@ func init() { } var fileDescriptorRuntime = []byte{ - // 639 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x6b, 0xdb, 0x4c, - 0x10, 0xb6, 0x24, 0x7f, 0x8e, 0x93, 0xbc, 0x62, 0x09, 0x41, 0x18, 0x5e, 0x29, 0xf8, 0x64, 0x78, - 0x41, 0x22, 0x7e, 0xe9, 0xa9, 0x50, 0x6a, 0x5b, 0x2a, 0xe8, 0x10, 0xdc, 0xae, 0x55, 0x08, 0xbd, - 0x18, 0xd9, 0xda, 0x38, 0x4b, 0x6d, 0xad, 0x90, 0x56, 0xa6, 0xb9, 0xf5, 0x17, 0x94, 0xfe, 0x96, - 0xfe, 0x83, 0xde, 0x72, 0xec, 0xb1, 0x27, 0xb7, 0xd1, 0x2f, 0x29, 0x5a, 0xc9, 0x4a, 0x68, 0x21, - 0xa4, 0xb9, 0x98, 0x79, 0x86, 0x99, 0xe7, 0xd9, 0x79, 0x66, 0x2c, 0x70, 0x56, 0x94, 0x5f, 0xa5, - 0x0b, 0x73, 0xc9, 0x36, 0xd6, 0x92, 0x85, 0xdc, 0xa7, 0x21, 0x89, 0x83, 0xfb, 0xa1, 0x1f, 0x51, - 0x2b, 0x21, 0xf1, 0x96, 0x2e, 0x49, 0x62, 0x91, 0x2d, 0x09, 0x79, 0x62, 0x6d, 0xcf, 0xac, 0x38, - 0x0d, 0x39, 0xdd, 0x10, 0x33, 0x8a, 0x19, 0x67, 0xe8, 0xdf, 0xbb, 0x06, 0x73, 0x5f, 0x6c, 0x16, - 0xc5, 0xe6, 0xf6, 0xac, 0x77, 0xbc, 0x62, 0x2b, 0x26, 0x2a, 0xad, 0x3c, 0x2a, 0x9a, 0x7a, 0xc6, - 0x8a, 0xb1, 0xd5, 0x9a, 0x58, 0x02, 0x2d, 0xd2, 0x4b, 0x2b, 0x27, 0x4c, 0xb8, 0xbf, 0x89, 0x8a, - 0x82, 0xfe, 0x06, 0x3a, 0xb8, 0x90, 0x71, 0xa7, 0xe8, 0x18, 0x1a, 0x09, 0x0f, 0x68, 0xa8, 0x49, - 0xa7, 0xd2, 0xa0, 0x83, 0x0b, 0x80, 0x4e, 0xa0, 0x99, 0xf0, 0x80, 0xa5, 0x5c, 0x93, 0x45, 0xba, - 0x44, 0x65, 0x9e, 0xc4, 0xb1, 0xa6, 0x54, 0x79, 0x12, 0xc7, 0xa8, 0x07, 0x6d, 0x4e, 0xe2, 0x0d, - 0x0d, 0xfd, 0xb5, 0x56, 0x3f, 0x95, 0x06, 0x6d, 0x5c, 0xe1, 0xbe, 0x07, 0x07, 0xa5, 0xdc, 0x39, - 0x4b, 0x43, 0x8e, 0x10, 0xd4, 0xf9, 0x75, 0x44, 0x4a, 0x41, 0x11, 0x0b, 0x5e, 0x96, 0xc6, 0x4b, - 0x52, 0xe9, 0x09, 0x84, 0x34, 0x68, 0xb1, 0x88, 0x53, 0x16, 0x26, 0x9a, 0x72, 0xaa, 0x0c, 0x3a, - 0x78, 0x0f, 0xfb, 0x9f, 0x64, 0x38, 0x2c, 0x69, 0x27, 0x31, 0xf1, 0x39, 0x41, 0x43, 0x38, 0xa8, - 0xec, 0x9a, 0xd3, 0xa0, 0xe0, 0x1f, 0xff, 0x93, 0xed, 0x8c, 0xee, 0x64, 0x9f, 0x77, 0x6d, 0xdc, - 0xad, 0x8a, 0xdc, 0x20, 0xd7, 0x5d, 0xa4, 0x61, 0xb0, 0xae, 0x74, 0x0b, 0x84, 0xa6, 0xd0, 0x8c, - 0x19, 0xe3, 0x97, 0x85, 0x6c, 0x77, 0xf8, 0x9f, 0xf9, 0xe0, 0x26, 0xcc, 0xfb, 0x03, 0x8e, 0x21, - 0xdb, 0x19, 0x4d, 0xcc, 0x18, 0x7f, 0x35, 0xc3, 0x25, 0x0d, 0x7a, 0x09, 0x32, 0x65, 0xc2, 0x9a, - 0xee, 0x70, 0xf0, 0x38, 0x32, 0x77, 0x3a, 0x6e, 0x66, 0x3b, 0x43, 0x76, 0xa7, 0x58, 0xa6, 0x0c, - 0xe9, 0x00, 0xcb, 0x2b, 0xb2, 0x7c, 0x1f, 0x31, 0x1a, 0x72, 0xad, 0x21, 0x9e, 0x7b, 0x2f, 0xd3, - 0xff, 0xa2, 0x54, 0x3e, 0x3b, 0x39, 0x15, 0x3a, 0x01, 0xb9, 0x72, 0xa1, 0x20, 0xb2, 0xb1, 0x4c, - 0x83, 0x3f, 0x7c, 0x92, 0x1f, 0xe1, 0x93, 0x5b, 0xee, 0x2c, 0xdf, 0xfa, 0xd1, 0xf0, 0xd9, 0xe3, - 0x06, 0x10, 0xcf, 0x30, 0xc5, 0xaf, 0x77, 0x1d, 0x91, 0x72, 0xd5, 0x2a, 0x28, 0x11, 0x0d, 0x84, - 0x15, 0x87, 0x38, 0x0f, 0x91, 0x01, 0x5d, 0xf2, 0x81, 0xf2, 0x79, 0xc2, 0x7d, 0x9e, 0x26, 0x62, - 0xb4, 0x43, 0x0c, 0x79, 0x6a, 0x26, 0x32, 0x68, 0x04, 0x9d, 0x1c, 0x91, 0x60, 0xee, 0x73, 0xad, - 0x29, 0x3c, 0xec, 0x99, 0xc5, 0x95, 0x9b, 0xfb, 0x2b, 0x37, 0xbd, 0xfd, 0x95, 0x8f, 0xdb, 0x37, - 0x3b, 0xa3, 0xf6, 0xf9, 0x87, 0x21, 0xe1, 0x76, 0xd1, 0x36, 0xe2, 0x68, 0x0c, 0x9d, 0xea, 0x6f, - 0xa0, 0xb5, 0xfe, 0x82, 0xe2, 0xae, 0xad, 0xff, 0x06, 0x3a, 0xd5, 0x30, 0xa8, 0x0d, 0x75, 0xe7, - 0xc2, 0xf5, 0xd4, 0x1a, 0x6a, 0x81, 0x32, 0x9d, 0x9e, 0xab, 0x12, 0x02, 0x68, 0x4e, 0xb0, 0x33, - 0xf2, 0x1c, 0x55, 0x46, 0x1d, 0x68, 0xcc, 0xbc, 0x11, 0xf6, 0x54, 0x05, 0x1d, 0x01, 0x38, 0x17, - 0xce, 0x64, 0x3e, 0xb2, 0x6d, 0xc7, 0x56, 0xeb, 0x79, 0xd9, 0xeb, 0xd1, 0xdb, 0x99, 0x63, 0xab, - 0x8d, 0xfe, 0x57, 0xa9, 0xba, 0x62, 0x9b, 0xac, 0xc9, 0x13, 0xaf, 0x58, 0x83, 0x56, 0xf9, 0xdd, - 0x28, 0xcf, 0x78, 0x0f, 0x7f, 0xb7, 0x56, 0x79, 0xd8, 0xda, 0xfa, 0x53, 0xac, 0x1d, 0x5f, 0xdc, - 0xdc, 0xea, 0xb5, 0xef, 0xb7, 0x7a, 0xed, 0x63, 0xa6, 0x4b, 0x37, 0x99, 0x2e, 0x7d, 0xcb, 0x74, - 0xe9, 0x67, 0xa6, 0x4b, 0xef, 0x5e, 0x3c, 0xf1, 0x2b, 0xf8, 0xbc, 0x88, 0x16, 0x4d, 0xf1, 0x82, - 0xff, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x14, 0xb7, 0x09, 0x4e, 0x05, 0x00, 0x00, + // 664 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6b, 0xdb, 0x4a, + 0x10, 0xb6, 0x24, 0x5b, 0xb6, 0xc7, 0x49, 0x9e, 0x58, 0x42, 0x10, 0x86, 0x67, 0x07, 0x9f, 0x0c, + 0x0f, 0x24, 0xe2, 0x47, 0x4f, 0x85, 0x52, 0xdb, 0x52, 0xa9, 0x28, 0xa9, 0xc3, 0x5a, 0x81, 0xd0, + 0x8b, 0x91, 0xad, 0x8d, 0xb3, 0xd4, 0xd6, 0x0a, 0x69, 0x65, 0x9a, 0x5b, 0x7f, 0x41, 0xe9, 0x5f, + 0xea, 0x2d, 0xc7, 0xf6, 0xd6, 0x93, 0xdb, 0xe8, 0x97, 0x14, 0xad, 0x64, 0x25, 0xb4, 0x10, 0xd2, + 0x5c, 0xcc, 0x7c, 0xc3, 0xcc, 0xf7, 0xed, 0x7c, 0x33, 0x16, 0xd8, 0x4b, 0xca, 0xaf, 0x92, 0xb9, + 0xb1, 0x60, 0x6b, 0x73, 0xc1, 0x02, 0xee, 0xd1, 0x80, 0x44, 0xfe, 0xfd, 0xd0, 0x0b, 0xa9, 0x19, + 0x93, 0x68, 0x43, 0x17, 0x24, 0x36, 0xc9, 0x86, 0x04, 0x3c, 0x36, 0x37, 0x27, 0x66, 0x94, 0x04, + 0x9c, 0xae, 0x89, 0x11, 0x46, 0x8c, 0x33, 0xf4, 0xef, 0x5d, 0x83, 0xb1, 0x2b, 0x36, 0xf2, 0x62, + 0x63, 0x73, 0xd2, 0x3e, 0x5c, 0xb2, 0x25, 0x13, 0x95, 0x66, 0x16, 0xe5, 0x4d, 0xed, 0xee, 0x92, + 0xb1, 0xe5, 0x8a, 0x98, 0x02, 0xcd, 0x93, 0x4b, 0x33, 0x23, 0x8c, 0xb9, 0xb7, 0x0e, 0xf3, 0x82, + 0xde, 0x1a, 0x9a, 0x38, 0x97, 0x71, 0x26, 0xe8, 0x10, 0x6a, 0x31, 0xf7, 0x69, 0xa0, 0x4b, 0xc7, + 0x52, 0xbf, 0x89, 0x73, 0x80, 0x8e, 0x40, 0x8d, 0xb9, 0xcf, 0x12, 0xae, 0xcb, 0x22, 0x5d, 0xa0, + 0x22, 0x4f, 0xa2, 0x48, 0x57, 0xca, 0x3c, 0x89, 0x22, 0xd4, 0x86, 0x06, 0x27, 0xd1, 0x9a, 0x06, + 0xde, 0x4a, 0xaf, 0x1e, 0x4b, 0xfd, 0x06, 0x2e, 0x71, 0xcf, 0x85, 0xbd, 0x42, 0xee, 0x94, 0x25, + 0x01, 0x47, 0x08, 0xaa, 0xfc, 0x3a, 0x24, 0x85, 0xa0, 0x88, 0x05, 0x2f, 0x4b, 0xa2, 0x05, 0x29, + 0xf5, 0x04, 0x42, 0x3a, 0xd4, 0x59, 0xc8, 0x29, 0x0b, 0x62, 0x5d, 0x39, 0x56, 0xfa, 0x4d, 0xbc, + 0x83, 0xbd, 0x4f, 0x32, 0xec, 0x17, 0xb4, 0xe3, 0x88, 0x78, 0x9c, 0xa0, 0x01, 0xec, 0x95, 0x76, + 0xcd, 0xa8, 0x9f, 0xf3, 0x8f, 0xfe, 0x49, 0xb7, 0xdd, 0xd6, 0x78, 0x97, 0x77, 0x2c, 0xdc, 0x2a, + 0x8b, 0x1c, 0x3f, 0xd3, 0x9d, 0x27, 0x81, 0xbf, 0x2a, 0x75, 0x73, 0x84, 0x26, 0xa0, 0x46, 0x8c, + 0xf1, 0xcb, 0x5c, 0xb6, 0x35, 0xf8, 0xcf, 0x78, 0x70, 0x13, 0xc6, 0xfd, 0x01, 0x47, 0x90, 0x6e, + 0xbb, 0x2a, 0x66, 0x8c, 0xbf, 0x9a, 0xe2, 0x82, 0x06, 0xbd, 0x04, 0x99, 0x32, 0x61, 0x4d, 0x6b, + 0xd0, 0x7f, 0x1c, 0x99, 0x33, 0x19, 0xa9, 0xe9, 0xb6, 0x2b, 0x3b, 0x13, 0x2c, 0x53, 0x86, 0x3a, + 0x00, 0x8b, 0x2b, 0xb2, 0x78, 0x1f, 0x32, 0x1a, 0x70, 0xbd, 0x26, 0x9e, 0x7b, 0x2f, 0xd3, 0xfb, + 0xa6, 0x94, 0x3e, 0xdb, 0x19, 0x15, 0x3a, 0x02, 0xb9, 0x74, 0x21, 0x27, 0xb2, 0xb0, 0x4c, 0xfd, + 0x3f, 0x7c, 0x92, 0x1f, 0xe1, 0x93, 0x53, 0xec, 0x2c, 0xdb, 0xfa, 0xc1, 0xe0, 0xd9, 0xe3, 0x06, + 0x10, 0xcf, 0x30, 0xc4, 0xaf, 0x7b, 0x1d, 0x92, 0x62, 0xd5, 0x1a, 0x28, 0x21, 0xf5, 0x85, 0x15, + 0xfb, 0x38, 0x0b, 0x51, 0x17, 0x5a, 0xe4, 0x03, 0xe5, 0xb3, 0x98, 0x7b, 0x3c, 0x89, 0xc5, 0x68, + 0xfb, 0x18, 0xb2, 0xd4, 0x54, 0x64, 0xd0, 0x10, 0x9a, 0x19, 0x22, 0xfe, 0xcc, 0xe3, 0xba, 0x2a, + 0x3c, 0x6c, 0x1b, 0xf9, 0x95, 0x1b, 0xbb, 0x2b, 0x37, 0xdc, 0xdd, 0x95, 0x8f, 0x1a, 0x37, 0xdb, + 0x6e, 0xe5, 0xf3, 0x8f, 0xae, 0x84, 0x1b, 0x79, 0xdb, 0x90, 0xa3, 0x11, 0x34, 0xcb, 0xbf, 0x81, + 0x5e, 0xff, 0x0b, 0x8a, 0xbb, 0xb6, 0x5e, 0x08, 0xcd, 0x72, 0x18, 0xd4, 0x80, 0xaa, 0x7d, 0xe1, + 0xb8, 0x5a, 0x05, 0xd5, 0x41, 0x99, 0x4c, 0x4e, 0x35, 0x09, 0x01, 0xa8, 0x63, 0x6c, 0x0f, 0x5d, + 0x5b, 0x93, 0x51, 0x13, 0x6a, 0x53, 0x77, 0x88, 0x5d, 0x4d, 0x41, 0x07, 0x00, 0xf6, 0x85, 0x3d, + 0x9e, 0x0d, 0x2d, 0xcb, 0xb6, 0xb4, 0x6a, 0x56, 0x76, 0x36, 0x3c, 0x9f, 0xda, 0x96, 0x56, 0x43, + 0x2d, 0xa8, 0x63, 0x7b, 0x7a, 0x7e, 0x6a, 0x5b, 0x9a, 0x8a, 0x34, 0xd8, 0x1b, 0xbf, 0xb6, 0xc7, + 0x6f, 0xce, 0x26, 0xce, 0x5b, 0xd7, 0xb6, 0xb4, 0x7a, 0xef, 0x8b, 0x54, 0x1e, 0xb9, 0x45, 0x56, + 0xe4, 0x89, 0x47, 0xae, 0x43, 0xbd, 0xf8, 0xac, 0x14, 0x57, 0xbe, 0x83, 0xbf, 0x3b, 0xaf, 0x3c, + 0xec, 0x7c, 0xf5, 0x29, 0xce, 0x8f, 0x2e, 0x6e, 0x6e, 0x3b, 0x95, 0xef, 0xb7, 0x9d, 0xca, 0xc7, + 0xb4, 0x23, 0xdd, 0xa4, 0x1d, 0xe9, 0x6b, 0xda, 0x91, 0x7e, 0xa6, 0x1d, 0xe9, 0xdd, 0x8b, 0x27, + 0x7e, 0x24, 0x9f, 0xe7, 0xd1, 0x5c, 0x15, 0x2f, 0xf8, 0xff, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xf5, 0x10, 0x75, 0xb5, 0x6d, 0x05, 0x00, 0x00, } diff --git a/api/services/events/v1/runtime.proto b/api/services/events/v1/runtime.proto index 9c472e17e..ee501947d 100644 --- a/api/services/events/v1/runtime.proto +++ b/api/services/events/v1/runtime.proto @@ -38,6 +38,8 @@ message RuntimeEvent { START = 3; EXEC_ADDED = 4; PAUSED = 5; + RESUMED = 6; + CHECKPOINTED = 7; } EventType type = 3; uint32 pid = 4; diff --git a/api/services/images/v1/images.pb.go b/api/services/images/v1/images.pb.go index 51e42b429..70003cc12 100644 --- a/api/services/images/v1/images.pb.go +++ b/api/services/images/v1/images.pb.go @@ -196,7 +196,7 @@ type ImagesClient interface { Get(ctx context.Context, in *GetImageRequest, opts ...grpc.CallOption) (*GetImageResponse, error) // List returns a list of all images known to containerd. List(ctx context.Context, in *ListImagesRequest, opts ...grpc.CallOption) (*ListImagesResponse, error) - // Create an image reocrd in the metadata store. + // Create an image record in the metadata store. // // The name of the image must be unique. Create(ctx context.Context, in *CreateImageRequest, opts ...grpc.CallOption) (*CreateImageResponse, error) @@ -267,7 +267,7 @@ type ImagesServer interface { Get(context.Context, *GetImageRequest) (*GetImageResponse, error) // List returns a list of all images known to containerd. List(context.Context, *ListImagesRequest) (*ListImagesResponse, error) - // Create an image reocrd in the metadata store. + // Create an image record in the metadata store. // // The name of the image must be unique. Create(context.Context, *CreateImageRequest) (*CreateImageResponse, error) diff --git a/linux/shim/service.go b/linux/shim/service.go index cac9cb048..dd89fc67f 100644 --- a/linux/shim/service.go +++ b/linux/shim/service.go @@ -283,6 +283,12 @@ func (s *Service) Pause(ctx context.Context, r *google_protobuf.Empty) (*google_ if err := s.initProcess.Pause(ctx); err != nil { return nil, err } + s.events <- &events.RuntimeEvent{ + Type: events.RuntimeEvent_PAUSED, + ID: s.id, + ContainerID: s.id, + Timestamp: time.Now(), + } return empty, nil } @@ -293,6 +299,12 @@ func (s *Service) Resume(ctx context.Context, r *google_protobuf.Empty) (*google if err := s.initProcess.Resume(ctx); err != nil { return nil, err } + s.events <- &events.RuntimeEvent{ + Type: events.RuntimeEvent_RESUMED, + ID: s.id, + ContainerID: s.id, + Timestamp: time.Now(), + } return empty, nil } @@ -344,6 +356,12 @@ func (s *Service) Checkpoint(ctx context.Context, r *shimapi.CheckpointTaskReque if err := s.initProcess.Checkpoint(ctx, r); err != nil { return nil, err } + s.events <- &events.RuntimeEvent{ + Type: events.RuntimeEvent_CHECKPOINTED, + ID: s.id, + ContainerID: s.id, + Timestamp: time.Now(), + } return empty, nil }