Merge pull request #1100 from crosbymichael/update-task

Implement task update
This commit is contained in:
Derek McGowan
2017-06-27 14:39:45 -07:00
committed by GitHub
15 changed files with 749 additions and 152 deletions

View File

@@ -23,6 +23,7 @@ import (
"github.com/containerd/containerd/plugin"
"github.com/containerd/fifo"
runc "github.com/containerd/go-runc"
specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
)
@@ -284,6 +285,14 @@ func (p *initProcess) Checkpoint(context context.Context, r *shimapi.CheckpointT
return nil
}
func (p *initProcess) Update(context context.Context, r *shimapi.UpdateTaskRequest) error {
var resources specs.LinuxResources
if err := json.Unmarshal(r.Resources.Value, &resources); err != nil {
return err
}
return p.runc.Update(context, p.id, &resources)
}
// TODO(mlaventure): move to runc package?
func getLastRuncError(r *runc.Runc) (string, error) {
if r.Log == "" {

View File

@@ -91,6 +91,10 @@ func (c *local) ShimInfo(ctx context.Context, in *google_protobuf.Empty, opts ..
return c.s.ShimInfo(ctx, in)
}
func (c *local) Update(ctx context.Context, in *shimapi.UpdateTaskRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) {
return c.s.Update(ctx, in)
}
type events struct {
c chan *shimapi.Event
ctx context.Context

View File

@@ -364,6 +364,16 @@ func (s *Service) ShimInfo(ctx context.Context, r *google_protobuf.Empty) (*shim
}, nil
}
func (s *Service) Update(ctx context.Context, r *shimapi.UpdateTaskRequest) (*google_protobuf.Empty, error) {
if s.initProcess == nil {
return nil, errors.New(ErrContainerNotCreated)
}
if err := s.initProcess.Update(ctx, r); err != nil {
return nil, err
}
return empty, nil
}
func (s *Service) waitExit(p process, pid int, cmd *reaper.Cmd) {
status := <-cmd.ExitCh
p.Exited(status)

View File

@@ -25,6 +25,7 @@
ShimInfoResponse
StreamEventsRequest
Event
UpdateTaskRequest
*/
package shim
@@ -258,6 +259,14 @@ func (m *Event) Reset() { *m = Event{} }
func (*Event) ProtoMessage() {}
func (*Event) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{15} }
type UpdateTaskRequest struct {
Resources *google_protobuf.Any `protobuf:"bytes,1,opt,name=resources" json:"resources,omitempty"`
}
func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} }
func (*UpdateTaskRequest) ProtoMessage() {}
func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorShim, []int{16} }
func init() {
proto.RegisterType((*CreateTaskRequest)(nil), "containerd.runtime.linux.shim.v1.CreateTaskRequest")
proto.RegisterType((*CreateTaskResponse)(nil), "containerd.runtime.linux.shim.v1.CreateTaskResponse")
@@ -275,6 +284,7 @@ func init() {
proto.RegisterType((*ShimInfoResponse)(nil), "containerd.runtime.linux.shim.v1.ShimInfoResponse")
proto.RegisterType((*StreamEventsRequest)(nil), "containerd.runtime.linux.shim.v1.StreamEventsRequest")
proto.RegisterType((*Event)(nil), "containerd.runtime.linux.shim.v1.Event")
proto.RegisterType((*UpdateTaskRequest)(nil), "containerd.runtime.linux.shim.v1.UpdateTaskRequest")
proto.RegisterEnum("containerd.runtime.linux.shim.v1.Event_EventType", Event_EventType_name, Event_EventType_value)
}
@@ -306,6 +316,7 @@ type ShimClient interface {
CloseIO(ctx context.Context, in *CloseIORequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
// ShimInfo returns information about the shim.
ShimInfo(ctx context.Context, in *google_protobuf1.Empty, opts ...grpc.CallOption) (*ShimInfoResponse, error)
Update(ctx context.Context, in *UpdateTaskRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error)
}
type shimClient struct {
@@ -474,6 +485,15 @@ func (c *shimClient) ShimInfo(ctx context.Context, in *google_protobuf1.Empty, o
return out, nil
}
func (c *shimClient) Update(ctx context.Context, in *UpdateTaskRequest, opts ...grpc.CallOption) (*google_protobuf1.Empty, error) {
out := new(google_protobuf1.Empty)
err := grpc.Invoke(ctx, "/containerd.runtime.linux.shim.v1.Shim/Update", in, out, c.cc, opts...)
if err != nil {
return nil, err
}
return out, nil
}
// Server API for Shim service
type ShimServer interface {
@@ -494,6 +514,7 @@ type ShimServer interface {
CloseIO(context.Context, *CloseIORequest) (*google_protobuf1.Empty, error)
// ShimInfo returns information about the shim.
ShimInfo(context.Context, *google_protobuf1.Empty) (*ShimInfoResponse, error)
Update(context.Context, *UpdateTaskRequest) (*google_protobuf1.Empty, error)
}
func RegisterShimServer(s *grpc.Server, srv ShimServer) {
@@ -773,6 +794,24 @@ func _Shim_ShimInfo_Handler(srv interface{}, ctx context.Context, dec func(inter
return interceptor(ctx, in, info, handler)
}
func _Shim_Update_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(UpdateTaskRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ShimServer).Update(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/containerd.runtime.linux.shim.v1.Shim/Update",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ShimServer).Update(ctx, req.(*UpdateTaskRequest))
}
return interceptor(ctx, in, info, handler)
}
var _Shim_serviceDesc = grpc.ServiceDesc{
ServiceName: "containerd.runtime.linux.shim.v1.Shim",
HandlerType: (*ShimServer)(nil),
@@ -833,6 +872,10 @@ var _Shim_serviceDesc = grpc.ServiceDesc{
MethodName: "ShimInfo",
Handler: _Shim_ShimInfo_Handler,
},
{
MethodName: "Update",
Handler: _Shim_Update_Handler,
},
},
Streams: []grpc.StreamDesc{
{
@@ -1460,6 +1503,34 @@ func (m *Event) MarshalTo(dAtA []byte) (int, error) {
return i, nil
}
func (m *UpdateTaskRequest) 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 *UpdateTaskRequest) MarshalTo(dAtA []byte) (int, error) {
var i int
_ = i
var l int
_ = l
if m.Resources != nil {
dAtA[i] = 0xa
i++
i = encodeVarintShim(dAtA, i, uint64(m.Resources.Size()))
n4, err := m.Resources.MarshalTo(dAtA[i:])
if err != nil {
return 0, err
}
i += n4
}
return i, nil
}
func encodeFixed64Shim(dAtA []byte, offset int, v uint64) int {
dAtA[offset] = uint8(v)
dAtA[offset+1] = uint8(v >> 8)
@@ -1759,6 +1830,16 @@ func (m *Event) Size() (n int) {
return n
}
func (m *UpdateTaskRequest) Size() (n int) {
var l int
_ = l
if m.Resources != nil {
l = m.Resources.Size()
n += 1 + l + sovShim(uint64(l))
}
return n
}
func sovShim(x uint64) (n int) {
for {
n++
@@ -1974,6 +2055,16 @@ func (this *Event) String() string {
}, "")
return s
}
func (this *UpdateTaskRequest) String() string {
if this == nil {
return "nil"
}
s := strings.Join([]string{`&UpdateTaskRequest{`,
`Resources:` + strings.Replace(fmt.Sprintf("%v", this.Resources), "Any", "google_protobuf.Any", 1) + `,`,
`}`,
}, "")
return s
}
func valueToStringShim(v interface{}) string {
rv := reflect.ValueOf(v)
if rv.IsNil() {
@@ -4058,6 +4149,89 @@ func (m *Event) Unmarshal(dAtA []byte) error {
}
return nil
}
func (m *UpdateTaskRequest) 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: UpdateTaskRequest: wiretype end group for non-group")
}
if fieldNum <= 0 {
return fmt.Errorf("proto: UpdateTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Resources", 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.Resources == nil {
m.Resources = &google_protobuf.Any{}
}
if err := m.Resources.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
@@ -4168,80 +4342,82 @@ func init() {
}
var fileDescriptorShim = []byte{
// 1186 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x73, 0xdb, 0xc4,
0x17, 0x8f, 0xfc, 0x43, 0xb6, 0x5f, 0xbe, 0xce, 0xb8, 0xdb, 0x34, 0x5f, 0xd5, 0x65, 0x9c, 0x8c,
0x0e, 0x34, 0x33, 0x4c, 0xe5, 0xc6, 0xa1, 0x4d, 0x08, 0x27, 0x27, 0xd6, 0x21, 0x03, 0x99, 0x98,
0xb5, 0x81, 0x0e, 0x33, 0x90, 0x51, 0xec, 0x8d, 0x2d, 0x22, 0x4b, 0x42, 0xbb, 0x0a, 0x31, 0xa7,
0x9e, 0x38, 0xf3, 0x27, 0x70, 0xe0, 0xce, 0x5f, 0xc0, 0x99, 0x1c, 0x39, 0x72, 0x2a, 0x6d, 0xfe,
0x12, 0x66, 0x57, 0x92, 0x2d, 0xdb, 0x51, 0x6d, 0x67, 0xb8, 0x58, 0xfb, 0x76, 0xdf, 0xdb, 0xfd,
0xec, 0xe7, 0xfd, 0x5a, 0xc3, 0x27, 0x3d, 0x93, 0xf5, 0xfd, 0x73, 0xad, 0xe3, 0x0c, 0xaa, 0x1d,
0xc7, 0x66, 0x86, 0x69, 0x13, 0xaf, 0x1b, 0x1f, 0x5a, 0xa6, 0xed, 0x5f, 0x57, 0x69, 0xdf, 0x1c,
0x54, 0xaf, 0x76, 0xc4, 0x57, 0x73, 0x3d, 0x87, 0x39, 0x68, 0x6b, 0xac, 0xa4, 0x79, 0xbe, 0xcd,
0xcc, 0x01, 0xd1, 0x84, 0xb2, 0x26, 0x94, 0xae, 0x76, 0xca, 0x8f, 0x7b, 0x8e, 0xd3, 0xb3, 0x48,
0x55, 0xe8, 0x9f, 0xfb, 0x17, 0x55, 0xc3, 0x1e, 0x06, 0xc6, 0xe5, 0x27, 0xd3, 0x4b, 0x64, 0xe0,
0xb2, 0x68, 0x71, 0xbd, 0xe7, 0xf4, 0x1c, 0x31, 0xac, 0xf2, 0x51, 0x38, 0xbb, 0x39, 0x6d, 0xc2,
0x4f, 0xa4, 0xcc, 0x18, 0xb8, 0xa1, 0xc2, 0xcb, 0xb9, 0x77, 0x31, 0x5c, 0xb3, 0xca, 0x86, 0x2e,
0xa1, 0xd5, 0x81, 0xe3, 0xdb, 0x2c, 0xb4, 0x3b, 0x58, 0xc2, 0x8e, 0x19, 0xf4, 0x52, 0xfc, 0x04,
0xb6, 0xea, 0x1f, 0x29, 0x78, 0x70, 0xe4, 0x11, 0x83, 0x91, 0xb6, 0x41, 0x2f, 0x31, 0xf9, 0xc1,
0x27, 0x94, 0xa1, 0x0d, 0x48, 0x99, 0x5d, 0x45, 0xda, 0x92, 0xb6, 0x0b, 0x87, 0xf2, 0xed, 0x9b,
0xcd, 0xd4, 0x71, 0x03, 0xa7, 0xcc, 0x2e, 0xda, 0x00, 0xf9, 0xdc, 0xb7, 0xbb, 0x16, 0x51, 0x52,
0x7c, 0x0d, 0x87, 0x12, 0x52, 0x20, 0x17, 0x32, 0xa8, 0xa4, 0xc5, 0x42, 0x24, 0xa2, 0x2a, 0xc8,
0x9e, 0xe3, 0xb0, 0x0b, 0xaa, 0x64, 0xb6, 0xd2, 0xdb, 0xab, 0xb5, 0xff, 0x6b, 0x31, 0xd6, 0x05,
0x24, 0xed, 0x84, 0x5f, 0x05, 0x87, 0x6a, 0xa8, 0x0c, 0x79, 0x46, 0xbc, 0x81, 0x69, 0x1b, 0x96,
0x92, 0xdd, 0x92, 0xb6, 0xf3, 0x78, 0x24, 0xa3, 0x75, 0xc8, 0x52, 0xd6, 0x35, 0x6d, 0x45, 0x16,
0x87, 0x04, 0x02, 0x07, 0x45, 0x59, 0xd7, 0xf1, 0x99, 0x92, 0x0b, 0x40, 0x05, 0x52, 0x38, 0x4f,
0x3c, 0x4f, 0xc9, 0x8f, 0xe6, 0x89, 0xe7, 0xa1, 0x0a, 0x40, 0xa7, 0x4f, 0x3a, 0x97, 0xae, 0x63,
0xda, 0x4c, 0x29, 0x88, 0xb5, 0xd8, 0x0c, 0xfa, 0x08, 0x1e, 0xb8, 0x86, 0x47, 0x6c, 0x76, 0x16,
0x53, 0x03, 0xa1, 0x56, 0x0a, 0x16, 0x8e, 0x46, 0xf3, 0xea, 0x87, 0x80, 0xe2, 0xf4, 0x51, 0xd7,
0xb1, 0x29, 0x41, 0x25, 0x48, 0xbb, 0x21, 0x81, 0x45, 0xcc, 0x87, 0xea, 0xcf, 0x12, 0xac, 0x35,
0x88, 0x45, 0x18, 0x49, 0x56, 0x42, 0x9b, 0xb0, 0x4a, 0xae, 0x4d, 0x76, 0x46, 0x99, 0xc1, 0x7c,
0x2a, 0x38, 0x2e, 0x62, 0xe0, 0x53, 0x2d, 0x31, 0x83, 0xea, 0x50, 0xe0, 0x12, 0xe9, 0x9e, 0x19,
0x4c, 0x30, 0xbd, 0x5a, 0x2b, 0x6b, 0x41, 0x58, 0x69, 0x51, 0x58, 0x69, 0xed, 0x28, 0xac, 0x0e,
0xf3, 0x37, 0x6f, 0x36, 0x57, 0x7e, 0xf9, 0x67, 0x53, 0xc2, 0xf9, 0xc0, 0xac, 0xce, 0xd4, 0x6d,
0x58, 0x0f, 0x70, 0x34, 0x3d, 0xa7, 0x43, 0x28, 0x8d, 0x5c, 0x3e, 0x0b, 0xf9, 0x57, 0x09, 0x90,
0x7e, 0x4d, 0x3a, 0x53, 0x8a, 0x71, 0x07, 0x49, 0x49, 0x0e, 0x4a, 0xdd, 0xed, 0xa0, 0x74, 0x82,
0x83, 0x32, 0x13, 0x0e, 0xda, 0x86, 0x0c, 0x75, 0x49, 0x47, 0xb8, 0x7f, 0xb5, 0xb6, 0x3e, 0x73,
0xc1, 0xba, 0x3d, 0xc4, 0x42, 0x43, 0x7d, 0x0a, 0x0f, 0x27, 0x10, 0x26, 0xd2, 0x8f, 0xa1, 0x84,
0x09, 0x35, 0x7f, 0x22, 0x4d, 0x36, 0x4c, 0xbc, 0x31, 0x87, 0xff, 0xa3, 0xd9, 0x65, 0xfd, 0x90,
0xf9, 0x40, 0xe0, 0x30, 0xfb, 0xc4, 0xec, 0xf5, 0x03, 0xf8, 0x45, 0x1c, 0x4a, 0xea, 0x6f, 0x29,
0x28, 0x72, 0xbf, 0x8c, 0x3d, 0xba, 0x6c, 0xda, 0x84, 0x08, 0xd2, 0x63, 0x04, 0xbb, 0x9c, 0x12,
0xe1, 0x7c, 0x4e, 0xc9, 0x5a, 0xed, 0x49, 0x3c, 0x5d, 0xae, 0x76, 0xc2, 0x8c, 0x09, 0xa2, 0x01,
0x87, 0xaa, 0xe8, 0x00, 0x0a, 0x6e, 0xc0, 0x00, 0xa1, 0x4a, 0x56, 0xa4, 0xd9, 0x07, 0x77, 0xda,
0x45, 0x3c, 0x8d, 0xd5, 0xff, 0xa3, 0x94, 0x8a, 0xc7, 0x44, 0x61, 0x32, 0x26, 0xd4, 0x63, 0x58,
0xfd, 0xcc, 0xb4, 0xac, 0x71, 0x69, 0x91, 0xa9, 0xd9, 0x8b, 0x82, 0xa7, 0x88, 0x43, 0x89, 0x73,
0x61, 0x58, 0x96, 0x20, 0x28, 0x8f, 0xf9, 0x70, 0x96, 0x1d, 0x75, 0x1f, 0xd6, 0x8e, 0x2c, 0x87,
0x92, 0xe3, 0xd3, 0xf7, 0xfa, 0x70, 0x1c, 0x82, 0xf9, 0xf0, 0x42, 0xaa, 0x06, 0xeb, 0x9f, 0x9b,
0x94, 0x35, 0xa3, 0x7b, 0xcf, 0x29, 0x74, 0x6a, 0x0b, 0x1e, 0x4d, 0xe9, 0x87, 0x2e, 0x9e, 0xe0,
0x5a, 0x5a, 0x8a, 0x6b, 0xf5, 0x4f, 0x09, 0x1e, 0x8d, 0x4b, 0x47, 0xbc, 0xde, 0x22, 0xc8, 0xb8,
0x06, 0xeb, 0x07, 0x40, 0xb0, 0x18, 0xa3, 0xef, 0x20, 0xe7, 0xb8, 0xcc, 0x74, 0x6c, 0x5e, 0x08,
0xf8, 0x39, 0x0d, 0x6d, 0x5e, 0xc3, 0xd2, 0xee, 0xdc, 0x5d, 0x3b, 0x0d, 0xb6, 0xd1, 0x6d, 0xe6,
0x0d, 0x71, 0xb4, 0x69, 0xf9, 0x00, 0xfe, 0x17, 0x5f, 0xe0, 0x54, 0x5e, 0x92, 0x61, 0x08, 0x81,
0x0f, 0x39, 0x95, 0x57, 0x86, 0xe5, 0x47, 0x51, 0x1b, 0x08, 0x07, 0xa9, 0x7d, 0x49, 0x7d, 0x06,
0xa5, 0x56, 0xdf, 0x1c, 0x1c, 0xdb, 0x17, 0xce, 0x88, 0x99, 0xc7, 0x90, 0xe7, 0x30, 0xce, 0xc6,
0xfe, 0xc8, 0x71, 0xb9, 0x69, 0x76, 0xd5, 0x47, 0xf0, 0xb0, 0xc5, 0x3c, 0x62, 0x0c, 0xf4, 0x2b,
0x62, 0xb3, 0x88, 0x7c, 0xf5, 0xf7, 0x14, 0x64, 0xc5, 0x4c, 0x62, 0xe2, 0xe8, 0x90, 0xe1, 0x6c,
0x0a, 0x00, 0x6b, 0xb5, 0x9d, 0xf9, 0x04, 0x88, 0xed, 0x82, 0xdf, 0xf6, 0xd0, 0x25, 0x58, 0x98,
0xdf, 0x91, 0x67, 0x53, 0x95, 0x36, 0xf3, 0xfe, 0x4a, 0x9b, 0xbd, 0x57, 0xa5, 0xfd, 0x02, 0x0a,
0x23, 0x20, 0x28, 0x0f, 0x19, 0xfd, 0xd5, 0x71, 0xbb, 0xb4, 0x82, 0x72, 0x90, 0x3e, 0x3d, 0x3d,
0x29, 0x49, 0x08, 0x40, 0x3e, 0xc2, 0x7a, 0xbd, 0xad, 0x97, 0x52, 0xa8, 0x00, 0xd9, 0x56, 0xbb,
0x8e, 0xdb, 0xa5, 0x34, 0x5a, 0x03, 0xd0, 0x5f, 0xe9, 0x47, 0x67, 0xf5, 0x46, 0x43, 0x6f, 0x94,
0x32, 0x5c, 0xad, 0x59, 0xff, 0xb2, 0xa5, 0x37, 0x4a, 0xd9, 0xda, 0x5b, 0x80, 0x0c, 0x27, 0x1e,
0x35, 0x21, 0x2b, 0x4a, 0x0f, 0xda, 0x98, 0x01, 0xa5, 0xf3, 0x87, 0x48, 0xb9, 0x3a, 0x9f, 0xab,
0xc9, 0xda, 0x45, 0x41, 0x0e, 0x1a, 0x19, 0xda, 0x5d, 0x20, 0xce, 0xa6, 0x5f, 0x0c, 0xe5, 0x8f,
0x97, 0x33, 0x0a, 0x0f, 0xdd, 0x13, 0xd7, 0xf0, 0x58, 0xe2, 0x35, 0x12, 0xe6, 0x11, 0x06, 0x39,
0xe8, 0x62, 0x89, 0x96, 0xcf, 0xe7, 0x03, 0x9a, 0xea, 0xc7, 0x43, 0x28, 0x4e, 0x74, 0x46, 0xf4,
0x72, 0xd1, 0x2d, 0x26, 0x3b, 0xe4, 0x3d, 0x8e, 0x7e, 0x2d, 0x41, 0x71, 0xa2, 0xde, 0x2c, 0x72,
0xf6, 0x5d, 0x05, 0xad, 0xbc, 0xb7, 0xb4, 0xdd, 0xd8, 0x15, 0x4d, 0xc3, 0xa7, 0x64, 0x69, 0x57,
0xec, 0x83, 0x8c, 0x09, 0xf5, 0x07, 0xcb, 0x5b, 0x7e, 0x0b, 0x30, 0x2e, 0x58, 0x68, 0xef, 0x9e,
0xe5, 0x2d, 0x71, 0xfb, 0xef, 0x41, 0x0e, 0xaa, 0x0e, 0x7a, 0xb1, 0x48, 0x32, 0xcc, 0xd4, 0xa7,
0xf2, 0xd3, 0x05, 0xeb, 0xcd, 0x73, 0x09, 0x9d, 0x40, 0x86, 0x37, 0x39, 0xf4, 0x6c, 0xbe, 0x49,
0xac, 0x19, 0x26, 0x42, 0xa7, 0x90, 0xe1, 0xef, 0x1a, 0xb4, 0x40, 0x56, 0xcd, 0xbe, 0xd0, 0xca,
0x2f, 0x96, 0xb4, 0x0a, 0x23, 0xe0, 0x6b, 0x28, 0x8c, 0xde, 0x48, 0xa8, 0x36, 0x7f, 0x8f, 0xe9,
0x07, 0x55, 0xe2, 0x6d, 0x5a, 0x90, 0x0b, 0xdb, 0x36, 0x5a, 0x20, 0x35, 0x26, 0x3b, 0x7c, 0xe2,
0xa6, 0x5f, 0x41, 0x3e, 0x6a, 0x41, 0x89, 0x81, 0xb7, 0xc0, 0x25, 0xa6, 0xdb, 0xd8, 0xe1, 0xc9,
0xcd, 0xbb, 0xca, 0xca, 0xdf, 0xef, 0x2a, 0x2b, 0xaf, 0x6f, 0x2b, 0xd2, 0xcd, 0x6d, 0x45, 0xfa,
0xeb, 0xb6, 0x22, 0xbd, 0xbd, 0xad, 0x48, 0xdf, 0xec, 0x2e, 0xf7, 0x57, 0xf3, 0x53, 0xfe, 0x3d,
0x97, 0x05, 0xa4, 0xdd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x26, 0xd4, 0xa9, 0x94, 0xa8, 0x0e,
0x00, 0x00,
// 1224 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6f, 0xe3, 0xc4,
0x17, 0xaf, 0xf3, 0xc3, 0x49, 0x5e, 0xbe, 0xa9, 0xb2, 0xb3, 0xdd, 0x7e, 0xb3, 0x59, 0x94, 0x56,
0x3e, 0xb0, 0x95, 0xd0, 0x3a, 0xdb, 0x94, 0xdd, 0x96, 0x72, 0x4a, 0x1b, 0x0b, 0x55, 0x50, 0x35,
0x4c, 0x52, 0x58, 0x21, 0x41, 0xe5, 0x26, 0xd3, 0xc4, 0x34, 0xb1, 0x8d, 0x67, 0x5c, 0x1a, 0x4e,
0x7b, 0xe2, 0xcc, 0x9f, 0xc0, 0x81, 0x3b, 0x47, 0x4e, 0x9c, 0xe9, 0x91, 0x23, 0xa7, 0x85, 0xed,
0x5f, 0x82, 0x66, 0x6c, 0xc7, 0x4e, 0x52, 0x6f, 0x92, 0x8a, 0x4b, 0x3c, 0x6f, 0xe6, 0xbd, 0x99,
0x37, 0x9f, 0xf7, 0xde, 0xe7, 0x4d, 0xe0, 0xa3, 0x9e, 0xc1, 0xfa, 0xee, 0xb9, 0xda, 0xb1, 0x86,
0xd5, 0x8e, 0x65, 0x32, 0xdd, 0x30, 0x89, 0xd3, 0x8d, 0x0e, 0x07, 0x86, 0xe9, 0x5e, 0x57, 0x69,
0xdf, 0x18, 0x56, 0xaf, 0xb6, 0xc5, 0x57, 0xb5, 0x1d, 0x8b, 0x59, 0x68, 0x33, 0x54, 0x52, 0x1d,
0xd7, 0x64, 0xc6, 0x90, 0xa8, 0x42, 0x59, 0x15, 0x4a, 0x57, 0xdb, 0xe5, 0xc7, 0x3d, 0xcb, 0xea,
0x0d, 0x48, 0x55, 0xe8, 0x9f, 0xbb, 0x17, 0x55, 0xdd, 0x1c, 0x79, 0xc6, 0xe5, 0x27, 0xd3, 0x4b,
0x64, 0x68, 0xb3, 0x60, 0x71, 0xad, 0x67, 0xf5, 0x2c, 0x31, 0xac, 0xf2, 0x91, 0x3f, 0xbb, 0x31,
0x6d, 0xc2, 0x4f, 0xa4, 0x4c, 0x1f, 0xda, 0xbe, 0xc2, 0xcb, 0xb9, 0x77, 0xd1, 0x6d, 0xa3, 0xca,
0x46, 0x36, 0xa1, 0xd5, 0xa1, 0xe5, 0x9a, 0xcc, 0xb7, 0xdb, 0x5f, 0xc2, 0x8e, 0xe9, 0xf4, 0x52,
0xfc, 0x78, 0xb6, 0xca, 0xef, 0x09, 0x78, 0x70, 0xe8, 0x10, 0x9d, 0x91, 0xb6, 0x4e, 0x2f, 0x31,
0xf9, 0xce, 0x25, 0x94, 0xa1, 0x75, 0x48, 0x18, 0xdd, 0x92, 0xb4, 0x29, 0x6d, 0xe5, 0x0e, 0xe4,
0xdb, 0x37, 0x1b, 0x89, 0xa3, 0x06, 0x4e, 0x18, 0x5d, 0xb4, 0x0e, 0xf2, 0xb9, 0x6b, 0x76, 0x07,
0xa4, 0x94, 0xe0, 0x6b, 0xd8, 0x97, 0x50, 0x09, 0x32, 0x3e, 0x82, 0xa5, 0xa4, 0x58, 0x08, 0x44,
0x54, 0x05, 0xd9, 0xb1, 0x2c, 0x76, 0x41, 0x4b, 0xa9, 0xcd, 0xe4, 0x56, 0xbe, 0xf6, 0x7f, 0x35,
0x82, 0xba, 0x70, 0x49, 0x3d, 0xe6, 0x57, 0xc1, 0xbe, 0x1a, 0x2a, 0x43, 0x96, 0x11, 0x67, 0x68,
0x98, 0xfa, 0xa0, 0x94, 0xde, 0x94, 0xb6, 0xb2, 0x78, 0x2c, 0xa3, 0x35, 0x48, 0x53, 0xd6, 0x35,
0xcc, 0x92, 0x2c, 0x0e, 0xf1, 0x04, 0xee, 0x14, 0x65, 0x5d, 0xcb, 0x65, 0xa5, 0x8c, 0xe7, 0x94,
0x27, 0xf9, 0xf3, 0xc4, 0x71, 0x4a, 0xd9, 0xf1, 0x3c, 0x71, 0x1c, 0x54, 0x01, 0xe8, 0xf4, 0x49,
0xe7, 0xd2, 0xb6, 0x0c, 0x93, 0x95, 0x72, 0x62, 0x2d, 0x32, 0x83, 0x3e, 0x80, 0x07, 0xb6, 0xee,
0x10, 0x93, 0x9d, 0x45, 0xd4, 0x40, 0xa8, 0x15, 0xbd, 0x85, 0xc3, 0xf1, 0xbc, 0xf2, 0x3e, 0xa0,
0x28, 0x7c, 0xd4, 0xb6, 0x4c, 0x4a, 0x50, 0x11, 0x92, 0xb6, 0x0f, 0x60, 0x01, 0xf3, 0xa1, 0xf2,
0xa3, 0x04, 0xab, 0x0d, 0x32, 0x20, 0x8c, 0xc4, 0x2b, 0xa1, 0x0d, 0xc8, 0x93, 0x6b, 0x83, 0x9d,
0x51, 0xa6, 0x33, 0x97, 0x0a, 0x8c, 0x0b, 0x18, 0xf8, 0x54, 0x4b, 0xcc, 0xa0, 0x3a, 0xe4, 0xb8,
0x44, 0xba, 0x67, 0x3a, 0x13, 0x48, 0xe7, 0x6b, 0x65, 0xd5, 0x4b, 0x2b, 0x35, 0x48, 0x2b, 0xb5,
0x1d, 0xa4, 0xd5, 0x41, 0xf6, 0xe6, 0xcd, 0xc6, 0xca, 0x4f, 0x7f, 0x6f, 0x48, 0x38, 0xeb, 0x99,
0xd5, 0x99, 0xb2, 0x05, 0x6b, 0x9e, 0x1f, 0x4d, 0xc7, 0xea, 0x10, 0x4a, 0x83, 0x90, 0xcf, 0xba,
0xfc, 0xb3, 0x04, 0x48, 0xbb, 0x26, 0x9d, 0x29, 0xc5, 0x68, 0x80, 0xa4, 0xb8, 0x00, 0x25, 0xee,
0x0e, 0x50, 0x32, 0x26, 0x40, 0xa9, 0x89, 0x00, 0x6d, 0x41, 0x8a, 0xda, 0xa4, 0x23, 0xc2, 0x9f,
0xaf, 0xad, 0xcd, 0x5c, 0xb0, 0x6e, 0x8e, 0xb0, 0xd0, 0x50, 0x9e, 0xc2, 0xc3, 0x09, 0x0f, 0x63,
0xe1, 0xc7, 0x50, 0xc4, 0x84, 0x1a, 0x3f, 0x90, 0x26, 0x1b, 0xc5, 0xde, 0x98, 0xbb, 0xff, 0xbd,
0xd1, 0x65, 0x7d, 0x1f, 0x79, 0x4f, 0xe0, 0x6e, 0xf6, 0x89, 0xd1, 0xeb, 0x7b, 0xee, 0x17, 0xb0,
0x2f, 0x29, 0xbf, 0x24, 0xa0, 0xc0, 0xe3, 0x12, 0x46, 0x74, 0xd9, 0xb2, 0xf1, 0x3d, 0x48, 0x86,
0x1e, 0xec, 0x70, 0x48, 0x44, 0xf0, 0x39, 0x24, 0xab, 0xb5, 0x27, 0xd1, 0x72, 0xb9, 0xda, 0xf6,
0x2b, 0xc6, 0xcb, 0x06, 0xec, 0xab, 0xa2, 0x7d, 0xc8, 0xd9, 0x1e, 0x02, 0x84, 0x96, 0xd2, 0xa2,
0xcc, 0xde, 0xbb, 0xd3, 0x2e, 0xc0, 0x29, 0x54, 0xff, 0x8f, 0x4a, 0x2a, 0x9a, 0x13, 0xb9, 0xc9,
0x9c, 0x50, 0x8e, 0x20, 0xff, 0xa9, 0x31, 0x18, 0x84, 0xd4, 0x22, 0x53, 0xa3, 0x17, 0x24, 0x4f,
0x01, 0xfb, 0x12, 0xc7, 0x42, 0x1f, 0x0c, 0x04, 0x40, 0x59, 0xcc, 0x87, 0xb3, 0xe8, 0x28, 0x7b,
0xb0, 0x7a, 0x38, 0xb0, 0x28, 0x39, 0x3a, 0x79, 0x67, 0x0c, 0xc3, 0x14, 0xcc, 0xfa, 0x17, 0x52,
0x54, 0x58, 0xfb, 0xcc, 0xa0, 0xac, 0x19, 0xdc, 0x7b, 0x0e, 0xd1, 0x29, 0x2d, 0x78, 0x34, 0xa5,
0xef, 0x87, 0x78, 0x02, 0x6b, 0x69, 0x29, 0xac, 0x95, 0x3f, 0x24, 0x78, 0x14, 0x52, 0x47, 0x94,
0x6f, 0x11, 0xa4, 0x6c, 0x9d, 0xf5, 0x3d, 0x47, 0xb0, 0x18, 0xa3, 0x6f, 0x20, 0x63, 0xd9, 0xcc,
0xb0, 0x4c, 0x4e, 0x04, 0xfc, 0x9c, 0x86, 0x3a, 0xaf, 0x61, 0xa9, 0x77, 0xee, 0xae, 0x9e, 0x78,
0xdb, 0x68, 0x26, 0x73, 0x46, 0x38, 0xd8, 0xb4, 0xbc, 0x0f, 0xff, 0x8b, 0x2e, 0x70, 0x28, 0x2f,
0xc9, 0xc8, 0x77, 0x81, 0x0f, 0x39, 0x94, 0x57, 0xfa, 0xc0, 0x0d, 0xb2, 0xd6, 0x13, 0xf6, 0x13,
0x7b, 0x92, 0xf2, 0x0c, 0x8a, 0xad, 0xbe, 0x31, 0x3c, 0x32, 0x2f, 0xac, 0x31, 0x32, 0x8f, 0x21,
0xcb, 0xdd, 0x38, 0x0b, 0xe3, 0x91, 0xe1, 0x72, 0xd3, 0xe8, 0x2a, 0x8f, 0xe0, 0x61, 0x8b, 0x39,
0x44, 0x1f, 0x6a, 0x57, 0xc4, 0x64, 0x01, 0xf8, 0xca, 0xaf, 0x09, 0x48, 0x8b, 0x99, 0xd8, 0xc2,
0xd1, 0x20, 0xc5, 0xd1, 0x14, 0x0e, 0xac, 0xd6, 0xb6, 0xe7, 0x03, 0x20, 0xb6, 0xf3, 0x7e, 0xdb,
0x23, 0x9b, 0x60, 0x61, 0x7e, 0x47, 0x9d, 0x4d, 0x31, 0x6d, 0xea, 0xdd, 0x4c, 0x9b, 0xbe, 0x17,
0xd3, 0x7e, 0x0e, 0xb9, 0xb1, 0x23, 0x28, 0x0b, 0x29, 0xed, 0xd5, 0x51, 0xbb, 0xb8, 0x82, 0x32,
0x90, 0x3c, 0x39, 0x39, 0x2e, 0x4a, 0x08, 0x40, 0x3e, 0xc4, 0x5a, 0xbd, 0xad, 0x15, 0x13, 0x28,
0x07, 0xe9, 0x56, 0xbb, 0x8e, 0xdb, 0xc5, 0x24, 0x5a, 0x05, 0xd0, 0x5e, 0x69, 0x87, 0x67, 0xf5,
0x46, 0x43, 0x6b, 0x14, 0x53, 0x5c, 0xad, 0x59, 0x3f, 0x6d, 0x69, 0x8d, 0x62, 0x5a, 0xf9, 0x04,
0x1e, 0x9c, 0xda, 0xdd, 0xa9, 0x66, 0x5d, 0x83, 0x9c, 0x43, 0xa8, 0xe5, 0x3a, 0x1d, 0x91, 0x92,
0xf1, 0x9c, 0x19, 0xaa, 0xd5, 0x7e, 0xcb, 0x43, 0x8a, 0x47, 0x10, 0x35, 0x21, 0x2d, 0x38, 0x0c,
0xad, 0xcf, 0x98, 0x68, 0xfc, 0x45, 0x53, 0xae, 0xce, 0x07, 0x7d, 0x92, 0x04, 0x29, 0xc8, 0x5e,
0x47, 0x44, 0x3b, 0x0b, 0x24, 0xec, 0xf4, 0xd3, 0xa3, 0xfc, 0xe1, 0x72, 0x46, 0xfe, 0xa1, 0xbb,
0xe2, 0x1a, 0x0e, 0x8b, 0xbd, 0x46, 0xcc, 0x3c, 0xc2, 0x20, 0x7b, 0xed, 0x30, 0xd6, 0xf2, 0xf9,
0x7c, 0x87, 0xa6, 0x1a, 0xfb, 0x08, 0x0a, 0x13, 0x2d, 0x16, 0xbd, 0x5c, 0x74, 0x8b, 0xc9, 0x56,
0x7b, 0x8f, 0xa3, 0x5f, 0x4b, 0x50, 0x98, 0x20, 0xae, 0x45, 0xce, 0xbe, 0x8b, 0x19, 0xcb, 0xbb,
0x4b, 0xdb, 0x85, 0xa1, 0x68, 0xea, 0x2e, 0x25, 0x4b, 0x87, 0x62, 0x0f, 0x64, 0x4c, 0xa8, 0x3b,
0x5c, 0xde, 0xf2, 0x6b, 0x80, 0x90, 0xf9, 0xd0, 0xee, 0x3d, 0x79, 0x32, 0x76, 0xfb, 0x6f, 0x41,
0xf6, 0xe8, 0x0b, 0xbd, 0x58, 0xa4, 0x18, 0x66, 0x88, 0xae, 0xfc, 0x74, 0x41, 0xe2, 0x7a, 0x2e,
0xa1, 0x63, 0x48, 0xf1, 0x6e, 0x89, 0x9e, 0xcd, 0x37, 0x89, 0x74, 0xd5, 0x58, 0xd7, 0x29, 0xa4,
0xf8, 0x03, 0x09, 0x2d, 0x50, 0x55, 0xb3, 0x4f, 0xbd, 0xf2, 0x8b, 0x25, 0xad, 0xfc, 0x0c, 0xf8,
0x12, 0x72, 0xe3, 0xc7, 0x16, 0xaa, 0xcd, 0xdf, 0x63, 0xfa, 0x65, 0x16, 0x7b, 0x9b, 0x16, 0x64,
0xfc, 0xfe, 0x8f, 0x16, 0x28, 0x8d, 0xc9, 0xa7, 0x42, 0xec, 0xa6, 0x5f, 0x40, 0x36, 0xe8, 0x65,
0xb1, 0x89, 0xb7, 0xc0, 0x25, 0x66, 0xfa, 0xe1, 0x29, 0xc8, 0x1e, 0x57, 0x2f, 0xc2, 0x83, 0x33,
0xac, 0x1e, 0xe7, 0xee, 0xc1, 0xf1, 0xcd, 0xdb, 0xca, 0xca, 0x5f, 0x6f, 0x2b, 0x2b, 0xaf, 0x6f,
0x2b, 0xd2, 0xcd, 0x6d, 0x45, 0xfa, 0xf3, 0xb6, 0x22, 0xfd, 0x73, 0x5b, 0x91, 0xbe, 0xda, 0x59,
0xee, 0xaf, 0xf0, 0xc7, 0xfc, 0x7b, 0x2e, 0x8b, 0xed, 0x77, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff,
0x94, 0x4d, 0x29, 0x2c, 0x48, 0x0f, 0x00, 0x00,
}

View File

@@ -47,6 +47,8 @@ service Shim {
// ShimInfo returns information about the shim.
rpc ShimInfo(google.protobuf.Empty) returns (ShimInfoResponse);
rpc Update(UpdateTaskRequest) returns (google.protobuf.Empty);
}
message CreateTaskRequest {
@@ -154,3 +156,7 @@ message Event {
uint32 exit_status = 4;
google.protobuf.Timestamp exited_at = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
}
message UpdateTaskRequest {
google.protobuf.Any resources = 1;
}

View File

@@ -192,6 +192,16 @@ func (t *Task) DeleteProcess(ctx context.Context, pid uint32) (*plugin.Exit, err
}, nil
}
func (t *Task) Update(ctx context.Context, resources []byte) error {
_, err := t.shim.Update(ctx, &shim.UpdateTaskRequest{
Resources: &protobuf.Any{
TypeUrl: specs.Version,
Value: resources,
},
})
return err
}
type Process struct {
pid int
t *Task