add support to kill container process by pid

This adds support for signalling a container process by pid. Signed-off-by: Evan Hazlett <ejhazlett@gmail.com> make Ps more extensible Signed-off-by: Evan Hazlett <ejhazlett@gmail.com> ps: windows support Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2017-05-09 15:50:02 -04:00
parent fae11b6673
commit ef158f8b5e
14 changed files with 1523 additions and 145 deletions
--- a/api/services/shim/shim.pb.go
+++ b/api/services/shim/shim.pb.go
@@ -26,6 +26,9 @@
 		ExitRequest
 		KillRequest
 		CloseStdinRequest
+		PsRequest
+		Ps
+		PsResponse
 */
 package shim

@@ -218,6 +221,31 @@ func (m *CloseStdinRequest) Reset()                    { *m = CloseStdinRequest{
 func (*CloseStdinRequest) ProtoMessage()               {}
 func (*CloseStdinRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{16} }

+type PsRequest struct {
+	ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
+}
+
+func (m *PsRequest) Reset()                    { *m = PsRequest{} }
+func (*PsRequest) ProtoMessage()               {}
+func (*PsRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{17} }
+
+type Ps struct {
+	Pid         uint32               `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"`
+	RuntimeData *google_protobuf.Any `protobuf:"bytes,2,opt,name=runtime_data,json=runtimeData" json:"runtime_data,omitempty"`
+}
+
+func (m *Ps) Reset()                    { *m = Ps{} }
+func (*Ps) ProtoMessage()               {}
+func (*Ps) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{18} }
+
+type PsResponse struct {
+	Ps []*Ps `protobuf:"bytes,1,rep,name=ps" json:"ps,omitempty"`
+}
+
+func (m *PsResponse) Reset()                    { *m = PsResponse{} }
+func (*PsResponse) ProtoMessage()               {}
+func (*PsResponse) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{19} }
+
 func init() {
 	proto.RegisterType((*CreateRequest)(nil), "containerd.v1.services.shim.CreateRequest")
 	proto.RegisterType((*CreateResponse)(nil), "containerd.v1.services.shim.CreateResponse")
@@ -236,6 +264,9 @@ func init() {
 	proto.RegisterType((*ExitRequest)(nil), "containerd.v1.services.shim.ExitRequest")
 	proto.RegisterType((*KillRequest)(nil), "containerd.v1.services.shim.KillRequest")
 	proto.RegisterType((*CloseStdinRequest)(nil), "containerd.v1.services.shim.CloseStdinRequest")
+	proto.RegisterType((*PsRequest)(nil), "containerd.v1.services.shim.PsRequest")
+	proto.RegisterType((*Ps)(nil), "containerd.v1.services.shim.Ps")
+	proto.RegisterType((*PsResponse)(nil), "containerd.v1.services.shim.PsResponse")
 }

 // Reference imports to suppress errors if they are not otherwise used.
@@ -253,6 +284,7 @@ type ShimClient interface {
 	Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
 	Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error)
 	State(ctx context.Context, in *StateRequest, opts ...grpc.CallOption) (*StateResponse, error)
+	Ps(ctx context.Context, in *PsRequest, opts ...grpc.CallOption) (*PsResponse, error)
 	Pause(ctx context.Context, in *PauseRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
 	Resume(ctx context.Context, in *ResumeRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
 	Exit(ctx context.Context, in *ExitRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
@@ -307,6 +339,15 @@ func (c *shimClient) State(ctx context.Context, in *StateRequest, opts ...grpc.C
 	return out, nil
 }

+func (c *shimClient) Ps(ctx context.Context, in *PsRequest, opts ...grpc.CallOption) (*PsResponse, error) {
+	out := new(PsResponse)
+	err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Ps", in, out, c.cc, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *shimClient) Pause(ctx context.Context, in *PauseRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
 	out := new(google_protobuf1.Empty)
 	err := grpc.Invoke(ctx, "/containerd.v1.services.shim.Shim/Pause", in, out, c.cc, opts...)
@@ -409,6 +450,7 @@ type ShimServer interface {
 	Start(context.Context, *StartRequest) (*google_protobuf1.Empty, error)
 	Delete(context.Context, *DeleteRequest) (*DeleteResponse, error)
 	State(context.Context, *StateRequest) (*StateResponse, error)
+	Ps(context.Context, *PsRequest) (*PsResponse, error)
 	Pause(context.Context, *PauseRequest) (*google_protobuf1.Empty, error)
 	Resume(context.Context, *ResumeRequest) (*google_protobuf1.Empty, error)
 	Exit(context.Context, *ExitRequest) (*google_protobuf1.Empty, error)
@@ -495,6 +537,24 @@ func _Shim_State_Handler(srv interface{}, ctx context.Context, dec func(interfac
 	return interceptor(ctx, in, info, handler)
 }

+func _Shim_Ps_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(PsRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(ShimServer).Ps(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/containerd.v1.services.shim.Shim/Ps",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(ShimServer).Ps(ctx, req.(*PsRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Shim_Pause_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(PauseRequest)
 	if err := dec(in); err != nil {
@@ -662,6 +722,10 @@ var _Shim_serviceDesc = grpc.ServiceDesc{
 			MethodName: "State",
 			Handler:    _Shim_State_Handler,
 		},
+		{
+			MethodName: "Ps",
+			Handler:    _Shim_Ps_Handler,
+		},
 		{
 			MethodName: "Pause",
 			Handler:    _Shim_Pause_Handler,
@@ -1231,6 +1295,93 @@ func (m *CloseStdinRequest) MarshalTo(dAtA []byte) (int, error) {
 	return i, nil
 }

+func (m *PsRequest) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *PsRequest) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.ID) > 0 {
+		dAtA[i] = 0xa
+		i++
+		i = encodeVarintShim(dAtA, i, uint64(len(m.ID)))
+		i += copy(dAtA[i:], m.ID)
+	}
+	return i, nil
+}
+
+func (m *Ps) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *Ps) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if m.Pid != 0 {
+		dAtA[i] = 0x8
+		i++
+		i = encodeVarintShim(dAtA, i, uint64(m.Pid))
+	}
+	if m.RuntimeData != nil {
+		dAtA[i] = 0x12
+		i++
+		i = encodeVarintShim(dAtA, i, uint64(m.RuntimeData.Size()))
+		n3, err := m.RuntimeData.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n3
+	}
+	return i, nil
+}
+
+func (m *PsResponse) Marshal() (dAtA []byte, err error) {
+	size := m.Size()
+	dAtA = make([]byte, size)
+	n, err := m.MarshalTo(dAtA)
+	if err != nil {
+		return nil, err
+	}
+	return dAtA[:n], nil
+}
+
+func (m *PsResponse) MarshalTo(dAtA []byte) (int, error) {
+	var i int
+	_ = i
+	var l int
+	_ = l
+	if len(m.Ps) > 0 {
+		for _, msg := range m.Ps {
+			dAtA[i] = 0xa
+			i++
+			i = encodeVarintShim(dAtA, i, uint64(msg.Size()))
+			n, err := msg.MarshalTo(dAtA[i:])
+			if err != nil {
+				return 0, err
+			}
+			i += n
+		}
+	}
+	return i, nil
+}
+
 func encodeFixed64Shim(dAtA []byte, offset int, v uint64) int {
 	dAtA[offset] = uint8(v)
 	dAtA[offset+1] = uint8(v >> 8)
@@ -1480,6 +1631,41 @@ func (m *CloseStdinRequest) Size() (n int) {
 	return n
 }

+func (m *PsRequest) Size() (n int) {
+	var l int
+	_ = l
+	l = len(m.ID)
+	if l > 0 {
+		n += 1 + l + sovShim(uint64(l))
+	}
+	return n
+}
+
+func (m *Ps) Size() (n int) {
+	var l int
+	_ = l
+	if m.Pid != 0 {
+		n += 1 + sovShim(uint64(m.Pid))
+	}
+	if m.RuntimeData != nil {
+		l = m.RuntimeData.Size()
+		n += 1 + l + sovShim(uint64(l))
+	}
+	return n
+}
+
+func (m *PsResponse) Size() (n int) {
+	var l int
+	_ = l
+	if len(m.Ps) > 0 {
+		for _, e := range m.Ps {
+			l = e.Size()
+			n += 1 + l + sovShim(uint64(l))
+		}
+	}
+	return n
+}
+
 func sovShim(x uint64) (n int) {
 	for {
 		n++
@@ -1680,6 +1866,37 @@ func (this *CloseStdinRequest) String() string {
 	}, "")
 	return s
 }
+func (this *PsRequest) String() string {
+	if this == nil {
+		return "nil"
+	}
+	s := strings.Join([]string{`&PsRequest{`,
+		`ID:` + fmt.Sprintf("%v", this.ID) + `,`,
+		`}`,
+	}, "")
+	return s
+}
+func (this *Ps) String() string {
+	if this == nil {
+		return "nil"
+	}
+	s := strings.Join([]string{`&Ps{`,
+		`Pid:` + fmt.Sprintf("%v", this.Pid) + `,`,
+		`RuntimeData:` + strings.Replace(fmt.Sprintf("%v", this.RuntimeData), "Any", "google_protobuf.Any", 1) + `,`,
+		`}`,
+	}, "")
+	return s
+}
+func (this *PsResponse) String() string {
+	if this == nil {
+		return "nil"
+	}
+	s := strings.Join([]string{`&PsResponse{`,
+		`Ps:` + strings.Replace(fmt.Sprintf("%v", this.Ps), "Ps", "Ps", 1) + `,`,
+		`}`,
+	}, "")
+	return s
+}
 func valueToStringShim(v interface{}) string {
 	rv := reflect.ValueOf(v)
 	if rv.IsNil() {
@@ -3357,6 +3574,268 @@ func (m *CloseStdinRequest) Unmarshal(dAtA []byte) error {
 	}
 	return nil
 }
+func (m *PsRequest) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowShim
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: PsRequest: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: PsRequest: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowShim
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthShim
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ID = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipShim(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthShim
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *Ps) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowShim
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: Ps: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: Ps: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		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 != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field RuntimeData", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowShim
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthShim
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.RuntimeData == nil {
+				m.RuntimeData = &google_protobuf.Any{}
+			}
+			if err := m.RuntimeData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipShim(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthShim
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
+func (m *PsResponse) Unmarshal(dAtA []byte) error {
+	l := len(dAtA)
+	iNdEx := 0
+	for iNdEx < l {
+		preIndex := iNdEx
+		var wire uint64
+		for shift := uint(0); ; shift += 7 {
+			if shift >= 64 {
+				return ErrIntOverflowShim
+			}
+			if iNdEx >= l {
+				return io.ErrUnexpectedEOF
+			}
+			b := dAtA[iNdEx]
+			iNdEx++
+			wire |= (uint64(b) & 0x7F) << shift
+			if b < 0x80 {
+				break
+			}
+		}
+		fieldNum := int32(wire >> 3)
+		wireType := int(wire & 0x7)
+		if wireType == 4 {
+			return fmt.Errorf("proto: PsResponse: wiretype end group for non-group")
+		}
+		if fieldNum <= 0 {
+			return fmt.Errorf("proto: PsResponse: illegal tag %d (wire type %d)", fieldNum, wire)
+		}
+		switch fieldNum {
+		case 1:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Ps", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowShim
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthShim
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.Ps = append(m.Ps, &Ps{})
+			if err := m.Ps[len(m.Ps)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
+			iNdEx = postIndex
+		default:
+			iNdEx = preIndex
+			skippy, err := skipShim(dAtA[iNdEx:])
+			if err != nil {
+				return err
+			}
+			if skippy < 0 {
+				return ErrInvalidLengthShim
+			}
+			if (iNdEx + skippy) > l {
+				return io.ErrUnexpectedEOF
+			}
+			iNdEx += skippy
+		}
+	}
+
+	if iNdEx > l {
+		return io.ErrUnexpectedEOF
+	}
+	return nil
+}
 func skipShim(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
@@ -3467,63 +3946,67 @@ func init() {
 }

 var fileDescriptorShim = []byte{
-	// 913 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0x4f, 0x6f, 0xe3, 0x44,
-	0x14, 0xaf, 0x93, 0xd4, 0x4d, 0x5f, 0xd6, 0x5d, 0x18, 0x55, 0x95, 0x37, 0x45, 0x49, 0xb1, 0x84,
-	0xc8, 0x2e, 0x92, 0x03, 0xd9, 0x1b, 0x82, 0x43, 0xbb, 0x2d, 0x62, 0x61, 0x91, 0xa2, 0xe9, 0xde,
-	0x90, 0xa8, 0xdc, 0x78, 0x9a, 0x8c, 0x64, 0x7b, 0x8c, 0x67, 0x5c, 0x36, 0x37, 0xce, 0x9c, 0xb8,
-	0xf2, 0x75, 0x38, 0xf5, 0xc8, 0x91, 0xd3, 0xc2, 0xe6, 0x3b, 0x70, 0x47, 0xf3, 0xc7, 0x76, 0xd2,
-	0xd6, 0x49, 0xf7, 0x62, 0xbd, 0xf7, 0xe6, 0xcd, 0x9b, 0xdf, 0xfb, 0xbd, 0x3f, 0x86, 0xaf, 0xa7,
-	0x54, 0xcc, 0xf2, 0x4b, 0x7f, 0xc2, 0xe2, 0xe1, 0x84, 0x25, 0x22, 0xa0, 0x09, 0xc9, 0xc2, 0x65,
-	0x31, 0x48, 0xe9, 0x90, 0x93, 0xec, 0x9a, 0x4e, 0x08, 0x1f, 0xf2, 0x19, 0x8d, 0xd5, 0xc7, 0x4f,
-	0x33, 0x26, 0x18, 0x3a, 0xac, 0x1c, 0xfd, 0xeb, 0x2f, 0xfc, 0xc2, 0xcf, 0x97, 0x2e, 0xdd, 0x27,
-	0x53, 0xc6, 0xa6, 0x11, 0x19, 0x2a, 0xd7, 0xcb, 0xfc, 0x6a, 0x18, 0x24, 0x73, 0x7d, 0xaf, 0x7b,
-	0x78, 0xfb, 0x88, 0xc4, 0xa9, 0x28, 0x0e, 0xf7, 0xa7, 0x6c, 0xca, 0x94, 0x38, 0x94, 0x92, 0xb1,
-	0x7e, 0xf5, 0x20, 0xa4, 0x62, 0x9e, 0x12, 0x3e, 0x8c, 0x59, 0x9e, 0x08, 0xfd, 0x35, 0xb7, 0x4f,
-	0xdf, 0xe3, 0x76, 0x69, 0xac, 0x24, 0x13, 0xa5, 0x7f, 0x1b, 0xb6, 0xa0, 0x31, 0xe1, 0x22, 0x88,
-	0x53, 0xed, 0xe0, 0xfd, 0xd6, 0x00, 0xe7, 0x45, 0x46, 0x02, 0x41, 0x30, 0xf9, 0x39, 0x27, 0x5c,
-	0xa0, 0x03, 0x68, 0xd0, 0xd0, 0xb5, 0x8e, 0xac, 0xc1, 0xee, 0x89, 0xbd, 0x78, 0xdb, 0x6f, 0xbc,
-	0x3c, 0xc5, 0x0d, 0x1a, 0xa2, 0x03, 0xb0, 0x2f, 0xf3, 0x24, 0x8c, 0x88, 0xdb, 0x90, 0x67, 0xd8,
-	0x68, 0xc8, 0x85, 0x9d, 0x2c, 0x4f, 0x64, 0x5c, 0xb7, 0xa9, 0x0e, 0x0a, 0x15, 0x3d, 0x81, 0x76,
-	0xc2, 0x2e, 0x52, 0x7a, 0xcd, 0x84, 0xdb, 0x3a, 0xb2, 0x06, 0x6d, 0xbc, 0x93, 0xb0, 0xb1, 0x54,
-	0x51, 0x17, 0xda, 0x82, 0x64, 0x31, 0x4d, 0x82, 0xc8, 0xdd, 0x56, 0x47, 0xa5, 0x8e, 0xf6, 0x61,
-	0x9b, 0x8b, 0x90, 0x26, 0xae, 0xad, 0xc2, 0x69, 0x45, 0x3e, 0xcf, 0x45, 0xc8, 0x72, 0xe1, 0xee,
-	0xe8, 0xe7, 0xb5, 0x66, 0xec, 0x24, 0xcb, 0xdc, 0x76, 0x69, 0x27, 0x59, 0x86, 0x46, 0x60, 0x67,
-	0x8c, 0x89, 0x2b, 0xee, 0xee, 0x1e, 0x35, 0x07, 0x9d, 0x51, 0xd7, 0x5f, 0xad, 0xbc, 0x62, 0xce,
-	0xff, 0x41, 0x32, 0x8e, 0x8d, 0xa7, 0xe7, 0xc1, 0x5e, 0xc1, 0x05, 0x4f, 0x59, 0xc2, 0x09, 0xfa,
-	0x00, 0x9a, 0xa9, 0x61, 0xc3, 0xc1, 0x52, 0xf4, 0xf6, 0xe0, 0xd1, 0xb9, 0x08, 0x32, 0x61, 0xe8,
-	0xf2, 0x3e, 0x06, 0xe7, 0x94, 0x44, 0xa4, 0xe2, 0xef, 0xee, 0x15, 0x01, 0x7b, 0x85, 0x8b, 0x09,
-	0xdb, 0x87, 0x0e, 0x79, 0x43, 0xc5, 0x05, 0x17, 0x81, 0xc8, 0xb9, 0xf1, 0x05, 0x69, 0x3a, 0x57,
-	0x16, 0x74, 0x0c, 0xbb, 0x52, 0x23, 0xe1, 0x45, 0x20, 0x14, 0xdf, 0x32, 0x01, 0x5d, 0x4b, 0xbf,
-	0xa8, 0xa5, 0xff, 0xba, 0xa8, 0xe5, 0x49, 0xfb, 0xe6, 0x6d, 0x7f, 0xeb, 0xf7, 0x7f, 0xfa, 0x16,
-	0x6e, 0xeb, 0x6b, 0xc7, 0xc2, 0xfb, 0xc3, 0x82, 0xce, 0xd9, 0x1b, 0x32, 0x29, 0x70, 0x2d, 0x53,
-	0x6e, 0xd5, 0x51, 0xde, 0xb8, 0x9f, 0xf2, 0x66, 0x0d, 0xe5, 0xad, 0x15, 0xca, 0x07, 0xd0, 0xe2,
-	0x29, 0x99, 0xa8, 0x82, 0x76, 0x46, 0xfb, 0x77, 0xf0, 0x1e, 0x27, 0x73, 0xac, 0x3c, 0xbc, 0x53,
-	0xb0, 0x71, 0x44, 0x63, 0x2a, 0x10, 0x82, 0x96, 0xac, 0x84, 0xee, 0x37, 0xac, 0x64, 0x69, 0x9b,
-	0x05, 0x59, 0xa8, 0xc0, 0xb4, 0xb0, 0x92, 0xa5, 0x8d, 0xb3, 0x2b, 0x8d, 0xa4, 0x85, 0x95, 0xec,
-	0x1d, 0xc1, 0x23, 0x9d, 0x60, 0x6d, 0xb1, 0x5e, 0x01, 0x8c, 0xc5, 0xbc, 0xb6, 0x32, 0x32, 0xef,
-	0x5f, 0x68, 0x28, 0x66, 0xea, 0x29, 0x07, 0x6b, 0x45, 0xe6, 0x37, 0x23, 0x74, 0x3a, 0xd3, 0xaf,
-	0x39, 0xd8, 0x68, 0xde, 0x63, 0x70, 0xce, 0xae, 0x49, 0x22, 0x78, 0x51, 0x7b, 0xdd, 0x0b, 0x65,
-	0xe9, 0xbd, 0x3f, 0x2d, 0x70, 0x8c, 0xc1, 0x40, 0x7a, 0xdf, 0x61, 0x32, 0x10, 0x9b, 0x15, 0xc4,
-	0xe7, 0x92, 0x6c, 0xd5, 0x25, 0x92, 0xec, 0xbd, 0xd1, 0xe1, 0xbd, 0x7d, 0xac, 0xdb, 0x06, 0x1b,
-	0x57, 0xf4, 0x25, 0xec, 0xa6, 0x19, 0x9b, 0x10, 0xce, 0x09, 0x77, 0xb7, 0x55, 0xff, 0x7f, 0x74,
-	0xef, 0xbd, 0xb1, 0xf6, 0xc2, 0x95, 0xbb, 0x4c, 0x6a, 0x1c, 0xe4, 0xbc, 0x4c, 0xea, 0x31, 0x38,
-	0x98, 0xf0, 0x3c, 0x2e, 0x0d, 0x8e, 0xec, 0x2b, 0x5a, 0x0e, 0xc0, 0x4b, 0xe8, 0x7c, 0x4f, 0xa3,
-	0xa8, 0x5a, 0x1f, 0x36, 0xa7, 0xd3, 0xa2, 0xc9, 0x1c, 0x6c, 0x34, 0x99, 0x59, 0x10, 0x45, 0x2a,
-	0xdd, 0x36, 0x96, 0xe2, 0xdd, 0x5c, 0xbd, 0x4f, 0xe0, 0xc3, 0x17, 0x11, 0xe3, 0xe4, 0x5c, 0xb6,
-	0x5f, 0x6d, 0xd5, 0x46, 0xff, 0xed, 0x40, 0xeb, 0x7c, 0x46, 0x63, 0x14, 0x80, 0xad, 0xe7, 0x15,
-	0x3d, 0xf3, 0xd7, 0xec, 0x75, 0x7f, 0x65, 0xc1, 0x75, 0x3f, 0x7b, 0x90, 0xaf, 0x29, 0xe0, 0x77,
-	0xb0, 0xad, 0xc6, 0x1d, 0x3d, 0x5d, 0x7b, 0x6b, 0x79, 0x25, 0x74, 0x0f, 0xee, 0x74, 0xfe, 0x99,
-	0xfc, 0x59, 0x48, 0xb8, 0x7a, 0x0f, 0x6c, 0x80, 0xbb, 0xb2, 0x4f, 0x36, 0xc0, 0xbd, 0xb5, 0x58,
-	0x7e, 0x52, 0x70, 0x05, 0xd9, 0x0c, 0xb7, 0x7a, 0xe0, 0xd9, 0x43, 0x5c, 0x2b, 0x3a, 0x54, 0x73,
-	0x6c, 0x88, 0xbf, 0xdc, 0x40, 0xb5, 0x74, 0xbc, 0x02, 0x5b, 0x37, 0xd6, 0x06, 0x3a, 0x56, 0xba,
-	0xaf, 0x36, 0xda, 0xb7, 0xd0, 0x92, 0x5d, 0x89, 0x06, 0x6b, 0x63, 0x2d, 0x35, 0x6e, 0x6d, 0x24,
-	0x0c, 0xb6, 0x1e, 0xf3, 0x0d, 0xb8, 0x56, 0x76, 0x41, 0xf7, 0xfe, 0xff, 0x8b, 0xf2, 0xf9, 0xdc,
-	0x92, 0xe8, 0xe4, 0x90, 0x6c, 0x40, 0xb7, 0x34, 0x47, 0xb5, 0xe8, 0x7e, 0x94, 0x79, 0x92, 0xc9,
-	0xc6, 0x3c, 0xcb, 0xc5, 0xdf, 0x7d, 0xfa, 0x00, 0x4f, 0x53, 0xde, 0x6f, 0xa0, 0x39, 0x16, 0x73,
-	0xf4, 0xe9, 0xfa, 0xe2, 0x96, 0x1b, 0xb5, 0x16, 0xe4, 0x6b, 0x80, 0x6a, 0x90, 0x91, 0xbf, 0x7e,
-	0xe0, 0x6e, 0x4f, 0x7c, 0x5d, 0xd4, 0x13, 0xf7, 0xe6, 0x5d, 0x6f, 0xeb, 0xef, 0x77, 0xbd, 0xad,
-	0x5f, 0x17, 0x3d, 0xeb, 0x66, 0xd1, 0xb3, 0xfe, 0x5a, 0xf4, 0xac, 0x7f, 0x17, 0x3d, 0xeb, 0xd2,
-	0x56, 0x9e, 0xcf, 0xff, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x79, 0x60, 0xe3, 0x1d, 0x0a, 0x00,
-	0x00,
+	// 983 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x55, 0xcd, 0x6f, 0xe3, 0x44,
+	0x14, 0xaf, 0x93, 0xd4, 0x4d, 0x5f, 0xea, 0x2e, 0x8c, 0xaa, 0xca, 0x9b, 0xa2, 0xa4, 0x18, 0x01,
+	0xdd, 0x45, 0x72, 0xa0, 0x7b, 0x40, 0x42, 0xec, 0xa1, 0xdd, 0x14, 0xb1, 0xb0, 0x88, 0x68, 0xba,
+	0x9c, 0x90, 0xa8, 0xdc, 0x78, 0x9a, 0x8c, 0x64, 0x7b, 0x8c, 0x67, 0x5c, 0x36, 0x37, 0xce, 0x9c,
+	0xb8, 0xf2, 0xef, 0x70, 0xea, 0x81, 0x03, 0x47, 0x4e, 0x0b, 0x9b, 0xbf, 0x04, 0xcd, 0x87, 0xf3,
+	0xd1, 0xc6, 0x71, 0xf7, 0x62, 0xcd, 0x3c, 0xff, 0xe6, 0xcd, 0xef, 0xfd, 0xde, 0xc7, 0xc0, 0xd3,
+	0x11, 0x15, 0xe3, 0xfc, 0xd2, 0x1f, 0xb2, 0xb8, 0x37, 0x64, 0x89, 0x08, 0x68, 0x42, 0xb2, 0x70,
+	0x71, 0x19, 0xa4, 0xb4, 0xc7, 0x49, 0x76, 0x4d, 0x87, 0x84, 0xf7, 0xf8, 0x98, 0xc6, 0xea, 0xe3,
+	0xa7, 0x19, 0x13, 0x0c, 0x1d, 0xcc, 0x81, 0xfe, 0xf5, 0x67, 0x7e, 0x81, 0xf3, 0x25, 0xa4, 0xfd,
+	0x70, 0xc4, 0xd8, 0x28, 0x22, 0x3d, 0x05, 0xbd, 0xcc, 0xaf, 0x7a, 0x41, 0x32, 0xd1, 0xe7, 0xda,
+	0x07, 0xb7, 0x7f, 0x91, 0x38, 0x15, 0xc5, 0xcf, 0xbd, 0x11, 0x1b, 0x31, 0xb5, 0xec, 0xc9, 0x95,
+	0xb1, 0x7e, 0x79, 0x2f, 0xa6, 0x62, 0x92, 0x12, 0xde, 0x8b, 0x59, 0x9e, 0x08, 0xfd, 0x35, 0xa7,
+	0xfb, 0x6f, 0x71, 0x7a, 0x66, 0x9c, 0xaf, 0x8c, 0x97, 0xee, 0x6d, 0xda, 0x82, 0xc6, 0x84, 0x8b,
+	0x20, 0x4e, 0x35, 0xc0, 0xfb, 0xad, 0x06, 0xce, 0xb3, 0x8c, 0x04, 0x82, 0x60, 0xf2, 0x73, 0x4e,
+	0xb8, 0x40, 0xfb, 0x50, 0xa3, 0xa1, 0x6b, 0x1d, 0x5a, 0x47, 0xdb, 0xa7, 0xf6, 0xf4, 0x75, 0xb7,
+	0xf6, 0xbc, 0x8f, 0x6b, 0x34, 0x44, 0xfb, 0x60, 0x5f, 0xe6, 0x49, 0x18, 0x11, 0xb7, 0x26, 0xff,
+	0x61, 0xb3, 0x43, 0x2e, 0x6c, 0x65, 0x79, 0x22, 0xfd, 0xba, 0x75, 0xf5, 0xa3, 0xd8, 0xa2, 0x87,
+	0xd0, 0x4c, 0xd8, 0x45, 0x4a, 0xaf, 0x99, 0x70, 0x1b, 0x87, 0xd6, 0x51, 0x13, 0x6f, 0x25, 0x6c,
+	0x20, 0xb7, 0xa8, 0x0d, 0x4d, 0x41, 0xb2, 0x98, 0x26, 0x41, 0xe4, 0x6e, 0xaa, 0x5f, 0xb3, 0x3d,
+	0xda, 0x83, 0x4d, 0x2e, 0x42, 0x9a, 0xb8, 0xb6, 0x72, 0xa7, 0x37, 0xf2, 0x7a, 0x2e, 0x42, 0x96,
+	0x0b, 0x77, 0x4b, 0x5f, 0xaf, 0x77, 0xc6, 0x4e, 0xb2, 0xcc, 0x6d, 0xce, 0xec, 0x24, 0xcb, 0xd0,
+	0x31, 0xd8, 0x19, 0x63, 0xe2, 0x8a, 0xbb, 0xdb, 0x87, 0xf5, 0xa3, 0xd6, 0x71, 0xdb, 0x5f, 0xce,
+	0xbc, 0x52, 0xce, 0xff, 0x4e, 0x2a, 0x8e, 0x0d, 0xd2, 0xf3, 0x60, 0xb7, 0xd0, 0x82, 0xa7, 0x2c,
+	0xe1, 0x04, 0xbd, 0x03, 0xf5, 0xd4, 0xa8, 0xe1, 0x60, 0xb9, 0xf4, 0x76, 0x61, 0xe7, 0x5c, 0x04,
+	0x99, 0x30, 0x72, 0x79, 0xef, 0x83, 0xd3, 0x27, 0x11, 0x99, 0xeb, 0x77, 0xf7, 0x88, 0x80, 0xdd,
+	0x02, 0x62, 0xdc, 0x76, 0xa1, 0x45, 0x5e, 0x51, 0x71, 0xc1, 0x45, 0x20, 0x72, 0x6e, 0xb0, 0x20,
+	0x4d, 0xe7, 0xca, 0x82, 0x4e, 0x60, 0x5b, 0xee, 0x48, 0x78, 0x11, 0x08, 0xa5, 0xb7, 0x0c, 0x40,
+	0xe7, 0xd2, 0x2f, 0x72, 0xe9, 0xbf, 0x2c, 0x72, 0x79, 0xda, 0xbc, 0x79, 0xdd, 0xdd, 0xf8, 0xfd,
+	0xdf, 0xae, 0x85, 0x9b, 0xfa, 0xd8, 0x89, 0xf0, 0xfe, 0xb0, 0xa0, 0x75, 0xf6, 0x8a, 0x0c, 0x0b,
+	0x5e, 0x8b, 0x92, 0x5b, 0x65, 0x92, 0xd7, 0x56, 0x4b, 0x5e, 0x2f, 0x91, 0xbc, 0xb1, 0x24, 0xf9,
+	0x11, 0x34, 0x78, 0x4a, 0x86, 0x2a, 0xa1, 0xad, 0xe3, 0xbd, 0x3b, 0x7c, 0x4f, 0x92, 0x09, 0x56,
+	0x08, 0xaf, 0x0f, 0x36, 0x8e, 0x68, 0x4c, 0x05, 0x42, 0xd0, 0x90, 0x99, 0xd0, 0xf5, 0x86, 0xd5,
+	0x5a, 0xda, 0xc6, 0x41, 0x16, 0x2a, 0x32, 0x0d, 0xac, 0xd6, 0xd2, 0xc6, 0xd9, 0x95, 0x66, 0xd2,
+	0xc0, 0x6a, 0xed, 0x1d, 0xc2, 0x8e, 0x0e, 0xb0, 0x34, 0x59, 0x2f, 0x00, 0x06, 0x62, 0x52, 0x9a,
+	0x19, 0x19, 0xf7, 0x2f, 0x34, 0x14, 0x63, 0x75, 0x95, 0x83, 0xf5, 0x46, 0xc6, 0x37, 0x26, 0x74,
+	0x34, 0xd6, 0xb7, 0x39, 0xd8, 0xec, 0xbc, 0x07, 0xe0, 0x9c, 0x5d, 0x93, 0x44, 0xf0, 0x22, 0xf7,
+	0xba, 0x16, 0x66, 0xa9, 0xf7, 0xfe, 0xb4, 0xc0, 0x31, 0x06, 0x43, 0xe9, 0x6d, 0x9b, 0xc9, 0x50,
+	0xac, 0xcf, 0x29, 0x3e, 0x91, 0x62, 0xab, 0x2a, 0x91, 0x62, 0xef, 0x1e, 0x1f, 0xac, 0xac, 0x63,
+	0x5d, 0x36, 0xd8, 0x40, 0xd1, 0x17, 0xb0, 0x9d, 0x66, 0x6c, 0x48, 0x38, 0x27, 0xdc, 0xdd, 0x54,
+	0xf5, 0xff, 0xde, 0xca, 0x73, 0x03, 0x8d, 0xc2, 0x73, 0xb8, 0x0c, 0x6a, 0x10, 0xe4, 0x7c, 0x16,
+	0xd4, 0x03, 0x70, 0x30, 0xe1, 0x79, 0x3c, 0x33, 0x38, 0xb2, 0xae, 0xe8, 0xac, 0x01, 0x9e, 0x43,
+	0xeb, 0x5b, 0x1a, 0x45, 0xf3, 0xf1, 0x61, 0x73, 0x3a, 0x2a, 0x8a, 0xcc, 0xc1, 0x66, 0x27, 0x23,
+	0x0b, 0xa2, 0x48, 0x85, 0xdb, 0xc4, 0x72, 0x79, 0x37, 0x56, 0xef, 0x43, 0x78, 0xf7, 0x59, 0xc4,
+	0x38, 0x39, 0x97, 0xe5, 0x57, 0xde, 0x4f, 0x1f, 0xc0, 0xf6, 0x80, 0x57, 0x8c, 0x2b, 0xef, 0x7b,
+	0xa8, 0x0d, 0xf8, 0x8a, 0x94, 0x7f, 0x0e, 0x3b, 0x66, 0x3e, 0x5d, 0x84, 0x81, 0x08, 0x4c, 0x73,
+	0xad, 0x2e, 0xd6, 0x96, 0x41, 0xf6, 0x03, 0x11, 0x78, 0x4f, 0x01, 0xe4, 0xad, 0x26, 0xb1, 0x3d,
+	0xa8, 0xa5, 0xb2, 0x71, 0xa5, 0xb4, 0x5d, 0x7f, 0xcd, 0xa3, 0xe2, 0x0f, 0x38, 0xae, 0xa5, 0xfc,
+	0xf8, 0xaf, 0x26, 0x34, 0xce, 0xc7, 0x34, 0x46, 0x01, 0xd8, 0x7a, 0xc8, 0xa0, 0xc7, 0x6b, 0xcf,
+	0x2d, 0x4d, 0xe5, 0xf6, 0x27, 0xf7, 0xc2, 0x1a, 0x72, 0xdf, 0xc0, 0xa6, 0x9a, 0x51, 0xe8, 0xd1,
+	0xda, 0x53, 0x8b, 0x73, 0xac, 0xbd, 0x7f, 0x47, 0x81, 0x33, 0xf9, 0xc2, 0x49, 0xba, 0x7a, 0x78,
+	0x55, 0xd0, 0x5d, 0x1a, 0x82, 0x15, 0x74, 0x6f, 0x4d, 0xc3, 0x9f, 0x14, 0x5d, 0x41, 0xaa, 0xe9,
+	0xce, 0x2f, 0x78, 0x7c, 0x1f, 0xa8, 0xf1, 0xff, 0x83, 0x2a, 0x85, 0x8f, 0xaa, 0xb2, 0x64, 0x3c,
+	0x7f, 0x5c, 0x89, 0x9b, 0xab, 0xac, 0x1a, 0xa5, 0x82, 0xf6, 0x62, 0x33, 0x95, 0xaa, 0xfc, 0x02,
+	0x6c, 0xdd, 0x64, 0x15, 0x2a, 0x2f, 0x75, 0x62, 0xa9, 0xb7, 0xaf, 0xa1, 0x21, 0x3b, 0x14, 0x1d,
+	0xad, 0xf5, 0xb5, 0xd0, 0xc4, 0xa5, 0x9e, 0x30, 0xd8, 0x7a, 0xe4, 0x55, 0xf0, 0x5a, 0x9a, 0x8b,
+	0xed, 0xd5, 0x6f, 0xad, 0xc2, 0x7c, 0x6a, 0x49, 0x76, 0x72, 0x60, 0x54, 0xb0, 0x5b, 0x98, 0x29,
+	0xa5, 0xec, 0x7e, 0x94, 0x71, 0x92, 0x61, 0x65, 0x9c, 0xb3, 0x47, 0xb0, 0xfd, 0xe8, 0x1e, 0x48,
+	0x93, 0xde, 0xaf, 0xa0, 0x3e, 0x10, 0x13, 0x54, 0x51, 0x0e, 0xb3, 0xd7, 0xa5, 0x94, 0xe4, 0x4b,
+	0x80, 0xf9, 0x50, 0x43, 0xfe, 0xfa, 0x3e, 0xbe, 0x3d, 0xfd, 0xca, 0xbc, 0x9e, 0xba, 0x37, 0x6f,
+	0x3a, 0x1b, 0xff, 0xbc, 0xe9, 0x6c, 0xfc, 0x3a, 0xed, 0x58, 0x37, 0xd3, 0x8e, 0xf5, 0xf7, 0xb4,
+	0x63, 0xfd, 0x37, 0xed, 0x58, 0x97, 0xb6, 0x42, 0x3e, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x7a,
+	0x10, 0xcb, 0x24, 0x29, 0x0b, 0x00, 0x00,
 }
--- a/api/services/shim/shim.proto
+++ b/api/services/shim/shim.proto
@@ -18,6 +18,7 @@ service Shim {
 	rpc Start(StartRequest) returns (google.protobuf.Empty);
 	rpc Delete(DeleteRequest) returns (DeleteResponse);
 	rpc State(StateRequest) returns (StateResponse);
+	rpc Ps(PsRequest) returns (PsResponse);
 	rpc Pause(PauseRequest) returns (google.protobuf.Empty);
 	rpc Resume(ResumeRequest) returns (google.protobuf.Empty);

@@ -113,3 +114,16 @@ message KillRequest {
 message CloseStdinRequest {
 	uint32 pid = 1;
 }
+
+message PsRequest {
+	string id = 1 [(gogoproto.customname) = "ID"];
+}
+
+message Ps {
+	uint32 pid = 1;
+	google.protobuf.Any runtime_data = 2;
+}
+
+message PsResponse{
+	repeated Ps ps = 1;
+}