diff --git a/api/services/tasks/v1/tasks.pb.go b/api/services/tasks/v1/tasks.pb.go index a6e60108c..1b6513899 100644 --- a/api/services/tasks/v1/tasks.pb.go +++ b/api/services/tasks/v1/tasks.pb.go @@ -11,7 +11,8 @@ It has these top-level messages: CreateTaskRequest CreateTaskResponse - StartTaskRequest + StartRequest + StartResponse DeleteTaskRequest DeleteResponse DeleteProcessRequest @@ -102,13 +103,22 @@ func (m *CreateTaskResponse) Reset() { *m = CreateTaskRespons func (*CreateTaskResponse) ProtoMessage() {} func (*CreateTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{1} } -type StartTaskRequest struct { +type StartRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ExecID string `protobuf:"bytes,2,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"` } -func (m *StartTaskRequest) Reset() { *m = StartTaskRequest{} } -func (*StartTaskRequest) ProtoMessage() {} -func (*StartTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{2} } +func (m *StartRequest) Reset() { *m = StartRequest{} } +func (*StartRequest) ProtoMessage() {} +func (*StartRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{2} } + +type StartResponse struct { + Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"` +} + +func (m *StartResponse) Reset() { *m = StartResponse{} } +func (*StartResponse) ProtoMessage() {} +func (*StartResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{3} } type DeleteTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -116,7 +126,7 @@ type DeleteTaskRequest struct { func (m *DeleteTaskRequest) Reset() { *m = DeleteTaskRequest{} } func (*DeleteTaskRequest) ProtoMessage() {} -func (*DeleteTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{3} } +func (*DeleteTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{4} } type DeleteResponse struct { ID string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` @@ -127,7 +137,7 @@ type DeleteResponse struct { func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (*DeleteResponse) ProtoMessage() {} -func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{4} } +func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{5} } type DeleteProcessRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -136,7 +146,7 @@ type DeleteProcessRequest struct { func (m *DeleteProcessRequest) Reset() { *m = DeleteProcessRequest{} } func (*DeleteProcessRequest) ProtoMessage() {} -func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{5} } +func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{6} } type GetTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -144,7 +154,7 @@ type GetTaskRequest struct { func (m *GetTaskRequest) Reset() { *m = GetTaskRequest{} } func (*GetTaskRequest) ProtoMessage() {} -func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{6} } +func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{7} } type GetTaskResponse struct { Task *containerd_v1_types.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` @@ -152,7 +162,7 @@ type GetTaskResponse struct { func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} } func (*GetTaskResponse) ProtoMessage() {} -func (*GetTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{7} } +func (*GetTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{8} } type ListTasksRequest struct { Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` @@ -160,7 +170,7 @@ type ListTasksRequest struct { func (m *ListTasksRequest) Reset() { *m = ListTasksRequest{} } func (*ListTasksRequest) ProtoMessage() {} -func (*ListTasksRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{8} } +func (*ListTasksRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{9} } type ListTasksResponse struct { Tasks []*containerd_v1_types.Task `protobuf:"bytes,1,rep,name=tasks" json:"tasks,omitempty"` @@ -168,7 +178,7 @@ type ListTasksResponse struct { func (m *ListTasksResponse) Reset() { *m = ListTasksResponse{} } func (*ListTasksResponse) ProtoMessage() {} -func (*ListTasksResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{9} } +func (*ListTasksResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{10} } type KillRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -179,7 +189,7 @@ type KillRequest struct { func (m *KillRequest) Reset() { *m = KillRequest{} } func (*KillRequest) ProtoMessage() {} -func (*KillRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{10} } +func (*KillRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{11} } type ExecProcessRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -197,15 +207,14 @@ type ExecProcessRequest struct { func (m *ExecProcessRequest) Reset() { *m = ExecProcessRequest{} } func (*ExecProcessRequest) ProtoMessage() {} -func (*ExecProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{11} } +func (*ExecProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{12} } type ExecProcessResponse struct { - Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"` } func (m *ExecProcessResponse) Reset() { *m = ExecProcessResponse{} } func (*ExecProcessResponse) ProtoMessage() {} -func (*ExecProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{12} } +func (*ExecProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{13} } type ResizePtyRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -216,7 +225,7 @@ type ResizePtyRequest struct { func (m *ResizePtyRequest) Reset() { *m = ResizePtyRequest{} } func (*ResizePtyRequest) ProtoMessage() {} -func (*ResizePtyRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{13} } +func (*ResizePtyRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{14} } type CloseIORequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -226,7 +235,7 @@ type CloseIORequest struct { func (m *CloseIORequest) Reset() { *m = CloseIORequest{} } func (*CloseIORequest) ProtoMessage() {} -func (*CloseIORequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{14} } +func (*CloseIORequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{15} } type PauseTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -234,7 +243,7 @@ type PauseTaskRequest struct { func (m *PauseTaskRequest) Reset() { *m = PauseTaskRequest{} } func (*PauseTaskRequest) ProtoMessage() {} -func (*PauseTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{15} } +func (*PauseTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{16} } type ResumeTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -242,7 +251,7 @@ type ResumeTaskRequest struct { func (m *ResumeTaskRequest) Reset() { *m = ResumeTaskRequest{} } func (*ResumeTaskRequest) ProtoMessage() {} -func (*ResumeTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{16} } +func (*ResumeTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{17} } type ListPidsRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -250,7 +259,7 @@ type ListPidsRequest struct { func (m *ListPidsRequest) Reset() { *m = ListPidsRequest{} } func (*ListPidsRequest) ProtoMessage() {} -func (*ListPidsRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{17} } +func (*ListPidsRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{18} } type ListPidsResponse struct { Pids []uint32 `protobuf:"varint,1,rep,packed,name=pids" json:"pids,omitempty"` @@ -258,7 +267,7 @@ type ListPidsResponse struct { func (m *ListPidsResponse) Reset() { *m = ListPidsResponse{} } func (*ListPidsResponse) ProtoMessage() {} -func (*ListPidsResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{18} } +func (*ListPidsResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{19} } type CheckpointTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -268,7 +277,7 @@ type CheckpointTaskRequest struct { func (m *CheckpointTaskRequest) Reset() { *m = CheckpointTaskRequest{} } func (*CheckpointTaskRequest) ProtoMessage() {} -func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{19} } +func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{20} } type CheckpointTaskResponse struct { Descriptors []*containerd_types1.Descriptor `protobuf:"bytes,1,rep,name=descriptors" json:"descriptors,omitempty"` @@ -276,7 +285,7 @@ type CheckpointTaskResponse struct { func (m *CheckpointTaskResponse) Reset() { *m = CheckpointTaskResponse{} } func (*CheckpointTaskResponse) ProtoMessage() {} -func (*CheckpointTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{20} } +func (*CheckpointTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{21} } type UpdateTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -285,12 +294,13 @@ type UpdateTaskRequest struct { func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } func (*UpdateTaskRequest) ProtoMessage() {} -func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{21} } +func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{22} } func init() { proto.RegisterType((*CreateTaskRequest)(nil), "containerd.services.tasks.v1.CreateTaskRequest") proto.RegisterType((*CreateTaskResponse)(nil), "containerd.services.tasks.v1.CreateTaskResponse") - proto.RegisterType((*StartTaskRequest)(nil), "containerd.services.tasks.v1.StartTaskRequest") + proto.RegisterType((*StartRequest)(nil), "containerd.services.tasks.v1.StartRequest") + proto.RegisterType((*StartResponse)(nil), "containerd.services.tasks.v1.StartResponse") proto.RegisterType((*DeleteTaskRequest)(nil), "containerd.services.tasks.v1.DeleteTaskRequest") proto.RegisterType((*DeleteResponse)(nil), "containerd.services.tasks.v1.DeleteResponse") proto.RegisterType((*DeleteProcessRequest)(nil), "containerd.services.tasks.v1.DeleteProcessRequest") @@ -325,8 +335,8 @@ const _ = grpc.SupportPackageIsVersion4 type TasksClient interface { // Create a task. Create(ctx context.Context, in *CreateTaskRequest, opts ...grpc.CallOption) (*CreateTaskResponse, error) - // Start a task. - Start(ctx context.Context, in *StartTaskRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) + // Start a process. + Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*StartResponse, error) // Delete a task and on disk state. Delete(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*DeleteResponse, error) DeleteProcess(ctx context.Context, in *DeleteProcessRequest, opts ...grpc.CallOption) (*DeleteResponse, error) @@ -334,7 +344,7 @@ type TasksClient interface { List(ctx context.Context, in *ListTasksRequest, opts ...grpc.CallOption) (*ListTasksResponse, error) // Kill a task or process. Kill(ctx context.Context, in *KillRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) - Exec(ctx context.Context, in *ExecProcessRequest, opts ...grpc.CallOption) (*ExecProcessResponse, error) + Exec(ctx context.Context, in *ExecProcessRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) ResizePty(ctx context.Context, in *ResizePtyRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) CloseIO(ctx context.Context, in *CloseIORequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) Pause(ctx context.Context, in *PauseTaskRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) @@ -361,8 +371,8 @@ func (c *tasksClient) Create(ctx context.Context, in *CreateTaskRequest, opts .. return out, nil } -func (c *tasksClient) Start(ctx context.Context, in *StartTaskRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { - out := new(google_protobuf.Empty) +func (c *tasksClient) Start(ctx context.Context, in *StartRequest, opts ...grpc.CallOption) (*StartResponse, error) { + out := new(StartResponse) err := grpc.Invoke(ctx, "/containerd.services.tasks.v1.Tasks/Start", in, out, c.cc, opts...) if err != nil { return nil, err @@ -415,8 +425,8 @@ func (c *tasksClient) Kill(ctx context.Context, in *KillRequest, opts ...grpc.Ca return out, nil } -func (c *tasksClient) Exec(ctx context.Context, in *ExecProcessRequest, opts ...grpc.CallOption) (*ExecProcessResponse, error) { - out := new(ExecProcessResponse) +func (c *tasksClient) Exec(ctx context.Context, in *ExecProcessRequest, opts ...grpc.CallOption) (*google_protobuf.Empty, error) { + out := new(google_protobuf.Empty) err := grpc.Invoke(ctx, "/containerd.services.tasks.v1.Tasks/Exec", in, out, c.cc, opts...) if err != nil { return nil, err @@ -492,8 +502,8 @@ func (c *tasksClient) Update(ctx context.Context, in *UpdateTaskRequest, opts .. type TasksServer interface { // Create a task. Create(context.Context, *CreateTaskRequest) (*CreateTaskResponse, error) - // Start a task. - Start(context.Context, *StartTaskRequest) (*google_protobuf.Empty, error) + // Start a process. + Start(context.Context, *StartRequest) (*StartResponse, error) // Delete a task and on disk state. Delete(context.Context, *DeleteTaskRequest) (*DeleteResponse, error) DeleteProcess(context.Context, *DeleteProcessRequest) (*DeleteResponse, error) @@ -501,7 +511,7 @@ type TasksServer interface { List(context.Context, *ListTasksRequest) (*ListTasksResponse, error) // Kill a task or process. Kill(context.Context, *KillRequest) (*google_protobuf.Empty, error) - Exec(context.Context, *ExecProcessRequest) (*ExecProcessResponse, error) + Exec(context.Context, *ExecProcessRequest) (*google_protobuf.Empty, error) ResizePty(context.Context, *ResizePtyRequest) (*google_protobuf.Empty, error) CloseIO(context.Context, *CloseIORequest) (*google_protobuf.Empty, error) Pause(context.Context, *PauseTaskRequest) (*google_protobuf.Empty, error) @@ -534,7 +544,7 @@ func _Tasks_Create_Handler(srv interface{}, ctx context.Context, dec func(interf } func _Tasks_Start_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(StartTaskRequest) + in := new(StartRequest) if err := dec(in); err != nil { return nil, err } @@ -546,7 +556,7 @@ func _Tasks_Start_Handler(srv interface{}, ctx context.Context, dec func(interfa FullMethod: "/containerd.services.tasks.v1.Tasks/Start", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TasksServer).Start(ctx, req.(*StartTaskRequest)) + return srv.(TasksServer).Start(ctx, req.(*StartRequest)) } return interceptor(ctx, in, info, handler) } @@ -967,7 +977,7 @@ func (m *CreateTaskResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *StartTaskRequest) Marshal() (dAtA []byte, err error) { +func (m *StartRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -977,7 +987,7 @@ func (m *StartTaskRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *StartTaskRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *StartRequest) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -988,6 +998,35 @@ func (m *StartTaskRequest) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } + if len(m.ExecID) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintTasks(dAtA, i, uint64(len(m.ExecID))) + i += copy(dAtA[i:], m.ExecID) + } + return i, nil +} + +func (m *StartResponse) 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 *StartResponse) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Pid != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) + } return i, nil } @@ -1321,11 +1360,6 @@ func (m *ExecProcessResponse) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Pid != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) - } return i, nil } @@ -1699,13 +1733,26 @@ func (m *CreateTaskResponse) Size() (n int) { return n } -func (m *StartTaskRequest) Size() (n int) { +func (m *StartRequest) Size() (n int) { var l int _ = l l = len(m.ContainerID) if l > 0 { n += 1 + l + sovTasks(uint64(l)) } + l = len(m.ExecID) + if l > 0 { + n += 1 + l + sovTasks(uint64(l)) + } + return n +} + +func (m *StartResponse) Size() (n int) { + var l int + _ = l + if m.Pid != 0 { + n += 1 + sovTasks(uint64(m.Pid)) + } return n } @@ -1849,9 +1896,6 @@ func (m *ExecProcessRequest) Size() (n int) { func (m *ExecProcessResponse) Size() (n int) { var l int _ = l - if m.Pid != 0 { - n += 1 + sovTasks(uint64(m.Pid)) - } return n } @@ -2020,12 +2064,23 @@ func (this *CreateTaskResponse) String() string { }, "") return s } -func (this *StartTaskRequest) String() string { +func (this *StartRequest) String() string { if this == nil { return "nil" } - s := strings.Join([]string{`&StartTaskRequest{`, + s := strings.Join([]string{`&StartRequest{`, `ContainerID:` + fmt.Sprintf("%v", this.ContainerID) + `,`, + `ExecID:` + fmt.Sprintf("%v", this.ExecID) + `,`, + `}`, + }, "") + return s +} +func (this *StartResponse) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&StartResponse{`, + `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `}`, }, "") return s @@ -2138,7 +2193,6 @@ func (this *ExecProcessResponse) String() string { return "nil" } s := strings.Join([]string{`&ExecProcessResponse{`, - `Pid:` + fmt.Sprintf("%v", this.Pid) + `,`, `}`, }, "") return s @@ -2630,7 +2684,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { +func (m *StartRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2653,10 +2707,10 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: StartTaskRequest: wiretype end group for non-group") + return fmt.Errorf("proto: StartRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: StartTaskRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: StartRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -2688,6 +2742,104 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { } m.ContainerID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ExecID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTasks + } + 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 ErrInvalidLengthTasks + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ExecID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTasks(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthTasks + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *StartResponse) 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 ErrIntOverflowTasks + } + 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: StartResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: StartResponse: 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 ErrIntOverflowTasks + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Pid |= (uint32(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipTasks(dAtA[iNdEx:]) @@ -3789,25 +3941,6 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: ExecProcessResponse: 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 ErrIntOverflowTasks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Pid |= (uint32(b) & 0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipTasks(dAtA[iNdEx:]) @@ -4896,80 +5029,81 @@ func init() { } var fileDescriptorTasks = []byte{ - // 1200 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4d, 0x6f, 0x1b, 0xc5, - 0x1b, 0xef, 0xfa, 0x65, 0x63, 0x3f, 0xfe, 0xa7, 0x49, 0xf6, 0x1f, 0x82, 0xbb, 0x54, 0x76, 0xb4, - 0x48, 0x60, 0x2a, 0xb2, 0x4b, 0x5c, 0xc4, 0x81, 0x56, 0x88, 0x24, 0x0e, 0x91, 0x05, 0x28, 0xe9, - 0xa6, 0x20, 0xd4, 0x8b, 0xb5, 0xf1, 0x4e, 0x9c, 0x51, 0xec, 0x9d, 0xed, 0xce, 0x38, 0x4d, 0xe0, - 0x00, 0x1f, 0xa1, 0x57, 0x2e, 0x5c, 0xf9, 0x2a, 0x39, 0x72, 0x44, 0x08, 0x05, 0xea, 0x6f, 0xc1, - 0x0d, 0xcd, 0x8b, 0x37, 0x1b, 0x3b, 0x7e, 0x49, 0x9d, 0x72, 0x49, 0x66, 0x66, 0x9f, 0xdf, 0x33, - 0xcf, 0xdb, 0xfc, 0x9e, 0x47, 0x86, 0xcd, 0x16, 0x66, 0x47, 0xdd, 0x03, 0xbb, 0x49, 0x3a, 0x4e, - 0x93, 0x04, 0xcc, 0xc3, 0x01, 0x8a, 0xfc, 0xe4, 0xd2, 0x0b, 0xb1, 0x43, 0x51, 0x74, 0x82, 0x9b, - 0x88, 0x3a, 0xcc, 0xa3, 0xc7, 0xd4, 0x39, 0x59, 0x97, 0x0b, 0x3b, 0x8c, 0x08, 0x23, 0xc6, 0xfd, - 0x4b, 0x69, 0xbb, 0x2f, 0x69, 0x4b, 0x81, 0x93, 0x75, 0xf3, 0x9d, 0x16, 0x21, 0xad, 0x36, 0x72, - 0x84, 0xec, 0x41, 0xf7, 0xd0, 0x41, 0x9d, 0x90, 0x9d, 0x49, 0xa8, 0x79, 0x6f, 0xf0, 0xa3, 0x17, - 0xf4, 0x3f, 0x2d, 0xb7, 0x48, 0x8b, 0x88, 0xa5, 0xc3, 0x57, 0xea, 0xf4, 0x93, 0xa9, 0xec, 0x65, - 0x67, 0x21, 0xa2, 0x4e, 0x87, 0x74, 0x03, 0xa6, 0x70, 0x8f, 0x6e, 0x80, 0xf3, 0x11, 0x6d, 0x46, - 0x38, 0x64, 0x24, 0x52, 0xe0, 0x4f, 0x6f, 0x00, 0xe6, 0x7e, 0x8b, 0x3f, 0x0a, 0x5b, 0x1e, 0xf4, - 0x90, 0xe1, 0x0e, 0xa2, 0xcc, 0xeb, 0x84, 0x52, 0xc0, 0x3a, 0x4f, 0xc1, 0xd2, 0x56, 0x84, 0x3c, - 0x86, 0x9e, 0x7a, 0xf4, 0xd8, 0x45, 0xcf, 0xbb, 0x88, 0x32, 0xa3, 0x0a, 0xff, 0x8b, 0xd5, 0x37, - 0xb0, 0x5f, 0xd4, 0x56, 0xb5, 0x4a, 0x7e, 0x73, 0xa1, 0x77, 0x51, 0x2e, 0x6c, 0xf5, 0xcf, 0xeb, - 0x35, 0xb7, 0x10, 0x0b, 0xd5, 0x7d, 0xc3, 0x01, 0x3d, 0x22, 0x84, 0x1d, 0xd2, 0x62, 0x7a, 0x35, - 0x5d, 0x29, 0x54, 0xdf, 0xb6, 0x13, 0x89, 0x11, 0xd6, 0xd9, 0x5f, 0xf3, 0x90, 0xb8, 0x4a, 0xcc, - 0x58, 0x86, 0x2c, 0x65, 0x3e, 0x0e, 0x8a, 0x19, 0xae, 0xdd, 0x95, 0x1b, 0x63, 0x05, 0x74, 0xca, - 0x7c, 0xd2, 0x65, 0xc5, 0xac, 0x38, 0x56, 0x3b, 0x75, 0x8e, 0xa2, 0xa8, 0xa8, 0xc7, 0xe7, 0x28, - 0x8a, 0x0c, 0x13, 0x72, 0x0c, 0x45, 0x1d, 0x1c, 0x78, 0xed, 0xe2, 0xdc, 0xaa, 0x56, 0xc9, 0xb9, - 0xf1, 0xde, 0x78, 0x0c, 0xd0, 0x3c, 0x42, 0xcd, 0xe3, 0x90, 0xe0, 0x80, 0x15, 0x73, 0xab, 0x5a, - 0xa5, 0x50, 0xbd, 0x3f, 0x6c, 0x56, 0x2d, 0x8e, 0xb8, 0x9b, 0x90, 0x37, 0x6c, 0x98, 0x23, 0x21, - 0xc3, 0x24, 0xa0, 0xc5, 0xbc, 0x80, 0x2e, 0xdb, 0x32, 0x9a, 0x76, 0x3f, 0x9a, 0xf6, 0x46, 0x70, - 0xe6, 0xf6, 0x85, 0xac, 0x67, 0x60, 0x24, 0x23, 0x49, 0x43, 0x12, 0x50, 0xf4, 0x5a, 0xa1, 0x5c, - 0x84, 0x74, 0x88, 0xfd, 0x62, 0x6a, 0x55, 0xab, 0xcc, 0xbb, 0x7c, 0x69, 0x7d, 0x01, 0x8b, 0xfb, - 0xcc, 0x8b, 0xd8, 0x8c, 0x49, 0xb2, 0x76, 0x60, 0xa9, 0x86, 0xda, 0x68, 0xe6, 0x6c, 0x5b, 0xbf, - 0x68, 0x70, 0x57, 0x6a, 0x8a, 0x3d, 0x5d, 0x81, 0x54, 0x0c, 0xd6, 0x7b, 0x17, 0xe5, 0x54, 0xbd, - 0xe6, 0xa6, 0xf0, 0x35, 0xde, 0x18, 0x65, 0x28, 0xa0, 0x53, 0xcc, 0x1a, 0x94, 0x79, 0xac, 0xcb, - 0xeb, 0x85, 0x7f, 0x01, 0x7e, 0xb4, 0x2f, 0x4e, 0x8c, 0x0d, 0xc8, 0xf3, 0x1d, 0xf2, 0x1b, 0x1e, - 0x13, 0xe5, 0x51, 0xa8, 0x9a, 0x43, 0xc1, 0x7f, 0xda, 0x2f, 0xe5, 0xcd, 0xdc, 0xf9, 0x45, 0xf9, - 0xce, 0xcb, 0xbf, 0xca, 0x9a, 0x9b, 0x93, 0xb0, 0x0d, 0x66, 0x11, 0x58, 0x96, 0xf6, 0xed, 0x45, - 0xa4, 0x89, 0x28, 0x9d, 0xa5, 0xb4, 0xdf, 0x85, 0x39, 0x74, 0x8a, 0x9a, 0x0d, 0xe5, 0x45, 0x7e, - 0x13, 0x7a, 0x17, 0x65, 0x7d, 0xfb, 0x14, 0x35, 0xeb, 0x35, 0x57, 0xe7, 0x9f, 0xea, 0xbe, 0x55, - 0x83, 0xbb, 0x3b, 0x68, 0xe6, 0x04, 0x7d, 0x0e, 0x0b, 0xb1, 0x16, 0x15, 0xd7, 0x35, 0xc8, 0xf0, - 0x17, 0x2d, 0xe0, 0x85, 0xea, 0xbd, 0x64, 0xfd, 0x9e, 0xac, 0xab, 0x12, 0x16, 0x00, 0x21, 0x66, - 0x3d, 0x80, 0xc5, 0xaf, 0x30, 0x15, 0x2a, 0x62, 0xa7, 0x57, 0x40, 0x3f, 0xc4, 0x6d, 0x86, 0x22, - 0x69, 0x83, 0xab, 0x76, 0x56, 0x0d, 0x96, 0x12, 0xb2, 0xea, 0x3e, 0x07, 0xb2, 0x82, 0x3e, 0x8b, - 0x9a, 0x78, 0xc7, 0x63, 0x2e, 0x94, 0x72, 0xd6, 0x4b, 0x0d, 0x0a, 0x5f, 0xe2, 0x76, 0xfb, 0x4d, - 0x87, 0x58, 0x70, 0x00, 0x6e, 0xf1, 0x97, 0x2e, 0x4b, 0x46, 0xed, 0x78, 0x85, 0x79, 0xed, 0xb6, - 0x28, 0x94, 0x9c, 0xcb, 0x97, 0xd6, 0x3f, 0x1a, 0x18, 0x1c, 0x7c, 0x0b, 0xc9, 0x8f, 0x69, 0x2a, - 0x75, 0x3d, 0x4d, 0xa5, 0x47, 0xd0, 0x54, 0x66, 0x24, 0x4d, 0x65, 0x07, 0x68, 0xaa, 0x02, 0x19, - 0x1a, 0xa2, 0xa6, 0x20, 0xb6, 0x51, 0x2c, 0x23, 0x24, 0x92, 0x51, 0x9a, 0x1b, 0x59, 0x88, 0xef, - 0xc3, 0xff, 0xaf, 0xb8, 0xae, 0xd2, 0xaa, 0x9e, 0xa1, 0x76, 0x49, 0x2a, 0x3f, 0x6b, 0xb0, 0xe8, - 0x22, 0x8a, 0xbf, 0x47, 0x7b, 0xec, 0xec, 0x8d, 0x27, 0x6f, 0x19, 0xb2, 0x2f, 0xb0, 0xcf, 0x8e, - 0x54, 0xee, 0xe4, 0x86, 0xc7, 0xeb, 0x08, 0xe1, 0xd6, 0x91, 0x7c, 0xe6, 0xf3, 0xae, 0xda, 0x59, - 0x3f, 0xc2, 0xdd, 0xad, 0x36, 0xa1, 0xa8, 0xbe, 0xfb, 0x5f, 0x18, 0x26, 0x13, 0x9c, 0x16, 0x79, - 0x91, 0x1b, 0xce, 0xb8, 0x7b, 0x5e, 0x97, 0xa2, 0x5b, 0x60, 0x5c, 0x17, 0xd1, 0x6e, 0x67, 0x66, - 0x45, 0xdb, 0xb0, 0xc0, 0xdf, 0xea, 0x1e, 0xf6, 0x67, 0x29, 0x67, 0xeb, 0x3d, 0x49, 0x0f, 0x52, - 0x8d, 0x2a, 0x0d, 0x03, 0x32, 0x21, 0xf6, 0xe5, 0x83, 0x9f, 0x77, 0xc5, 0xda, 0xfa, 0x53, 0x83, - 0xb7, 0xb6, 0xe2, 0x66, 0x38, 0xeb, 0x70, 0xd0, 0x80, 0xa5, 0xd0, 0x8b, 0x50, 0xc0, 0x1a, 0x89, - 0x86, 0x2c, 0x53, 0x52, 0xe5, 0xe4, 0xfd, 0xc7, 0x45, 0xf9, 0x41, 0x62, 0xcc, 0x21, 0x21, 0x0a, - 0x62, 0x38, 0x75, 0x5a, 0x64, 0xcd, 0xc7, 0x2d, 0x44, 0x99, 0x5d, 0x13, 0xff, 0xdc, 0x45, 0xa9, - 0x6c, 0xeb, 0xda, 0x66, 0x9d, 0x9e, 0xa6, 0x59, 0x7f, 0x07, 0x2b, 0x83, 0xde, 0xa9, 0x60, 0x7c, - 0x06, 0x85, 0xcb, 0x11, 0xac, 0x4f, 0x82, 0xe3, 0xa7, 0x86, 0x24, 0xc0, 0xfa, 0x01, 0x96, 0xbe, - 0x09, 0xfd, 0x5b, 0x18, 0xa8, 0xaa, 0x90, 0x8f, 0x10, 0x25, 0xdd, 0xa8, 0x89, 0xa8, 0x88, 0xd5, - 0x28, 0xa7, 0x2e, 0xc5, 0xaa, 0xbf, 0x16, 0x20, 0x2b, 0xd8, 0xdc, 0x38, 0x06, 0x5d, 0x4e, 0x23, - 0x86, 0x63, 0x8f, 0x9b, 0x90, 0xed, 0xa1, 0xe9, 0xcf, 0xfc, 0x68, 0x7a, 0x80, 0x8a, 0xd9, 0x2e, - 0x64, 0xc5, 0x78, 0x62, 0xd8, 0xe3, 0xa1, 0x83, 0x33, 0x8c, 0xb9, 0x32, 0xe4, 0xd0, 0x36, 0x9f, - 0xcf, 0x8d, 0x16, 0xe8, 0xb2, 0x7b, 0x4f, 0xb2, 0x7e, 0x68, 0x9a, 0x31, 0x3f, 0x9c, 0x06, 0x10, - 0x5b, 0xfe, 0x1c, 0xe6, 0xaf, 0x8c, 0x09, 0x46, 0x75, 0x1a, 0xf8, 0xd5, 0xb6, 0x72, 0xc3, 0x2b, - 0x0f, 0x20, 0xbd, 0x83, 0x98, 0x31, 0x01, 0x74, 0x75, 0x96, 0x30, 0xd7, 0xa6, 0x94, 0x56, 0x77, - 0xb4, 0x20, 0xc3, 0x5f, 0xf9, 0xa4, 0x7c, 0x0c, 0x0e, 0x0a, 0xa6, 0x33, 0xb5, 0xbc, 0xba, 0xa8, - 0x0e, 0x19, 0xde, 0xfa, 0x8d, 0x0f, 0xc6, 0x03, 0x13, 0xe3, 0xc1, 0xc8, 0x9c, 0x1f, 0x43, 0x86, - 0x33, 0xb3, 0x31, 0xa1, 0xfc, 0x86, 0xdb, 0xba, 0xb9, 0x7e, 0x03, 0x84, 0xb2, 0x7b, 0x1f, 0xf2, - 0x71, 0xeb, 0x9b, 0x14, 0xa5, 0xc1, 0x1e, 0x39, 0xd2, 0x83, 0x5d, 0x98, 0x53, 0x4d, 0x6b, 0x52, - 0x76, 0xaf, 0xf6, 0xb6, 0x31, 0x0a, 0xb3, 0xa2, 0x09, 0x4d, 0xb2, 0x70, 0xb0, 0x53, 0x8d, 0x54, - 0xf8, 0x04, 0x74, 0xd9, 0x8d, 0x26, 0xbd, 0xab, 0xa1, 0x9e, 0x35, 0x52, 0x25, 0x86, 0x5c, 0xbf, - 0xa1, 0x18, 0x6b, 0x93, 0xcb, 0x27, 0xd1, 0xbf, 0x4c, 0x7b, 0x5a, 0x71, 0x95, 0xb4, 0x17, 0x00, - 0x09, 0xca, 0x7f, 0x38, 0x21, 0xc4, 0xd7, 0x35, 0x2f, 0xf3, 0xe3, 0x9b, 0x81, 0xd4, 0xc5, 0x4f, - 0x40, 0x97, 0x9c, 0x3e, 0x29, 0x6c, 0x43, 0xcc, 0x3f, 0x2a, 0x6c, 0x9b, 0xdf, 0x9e, 0xbf, 0x2a, - 0xdd, 0xf9, 0xfd, 0x55, 0xe9, 0xce, 0x4f, 0xbd, 0x92, 0x76, 0xde, 0x2b, 0x69, 0xbf, 0xf5, 0x4a, - 0xda, 0xdf, 0xbd, 0x92, 0xf6, 0xec, 0xf1, 0xeb, 0xfd, 0x28, 0xf2, 0x48, 0x2c, 0x0e, 0x74, 0x71, - 0xcf, 0xc3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x8f, 0xc3, 0x21, 0xef, 0x5b, 0x11, 0x00, 0x00, + // 1211 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5d, 0x6f, 0x1b, 0x45, + 0x17, 0xee, 0xfa, 0x63, 0x63, 0x1f, 0x37, 0x6d, 0x3c, 0x6f, 0x9a, 0xd7, 0x5d, 0x2a, 0x3b, 0x2c, + 0x12, 0x32, 0x85, 0xec, 0x52, 0x17, 0x71, 0x41, 0x2b, 0x44, 0x13, 0x87, 0xc8, 0x02, 0xd4, 0x74, + 0x53, 0x10, 0xea, 0x8d, 0xd9, 0x78, 0x27, 0xce, 0x28, 0xf6, 0xce, 0x76, 0x67, 0x9c, 0x26, 0x70, + 0x01, 0x3f, 0xa1, 0xb7, 0x5c, 0xc0, 0xef, 0xc9, 0x25, 0x97, 0x08, 0xa1, 0x40, 0xfd, 0x2f, 0xb8, + 0x43, 0x3b, 0x33, 0xde, 0x6c, 0xec, 0xf8, 0x23, 0x75, 0xc3, 0x4d, 0x32, 0x33, 0x7b, 0x9e, 0x33, + 0x33, 0xcf, 0x39, 0xf3, 0x9c, 0x93, 0xc0, 0x7a, 0x9b, 0xf0, 0xfd, 0xde, 0xae, 0xd5, 0xa2, 0x5d, + 0xbb, 0x45, 0x7d, 0xee, 0x12, 0x1f, 0x87, 0x5e, 0x72, 0xe8, 0x06, 0xc4, 0x66, 0x38, 0x3c, 0x24, + 0x2d, 0xcc, 0x6c, 0xee, 0xb2, 0x03, 0x66, 0x1f, 0xde, 0x93, 0x03, 0x2b, 0x08, 0x29, 0xa7, 0xe8, + 0xce, 0x99, 0xb5, 0x35, 0xb0, 0xb4, 0xa4, 0xc1, 0xe1, 0x3d, 0xe3, 0xad, 0x36, 0xa5, 0xed, 0x0e, + 0xb6, 0x85, 0xed, 0x6e, 0x6f, 0xcf, 0xc6, 0xdd, 0x80, 0x1f, 0x4b, 0xa8, 0x71, 0x7b, 0xf8, 0xa3, + 0xeb, 0x0f, 0x3e, 0x2d, 0xb7, 0x69, 0x9b, 0x8a, 0xa1, 0x1d, 0x8d, 0xd4, 0xea, 0xc7, 0x33, 0x9d, + 0x97, 0x1f, 0x07, 0x98, 0xd9, 0x5d, 0xda, 0xf3, 0xb9, 0xc2, 0x3d, 0xb8, 0x04, 0xce, 0xc3, 0xac, + 0x15, 0x92, 0x80, 0xd3, 0x50, 0x81, 0x3f, 0xb9, 0x04, 0x38, 0xba, 0xb7, 0xf8, 0xa1, 0xb0, 0x95, + 0xe1, 0x1b, 0x72, 0xd2, 0xc5, 0x8c, 0xbb, 0xdd, 0x40, 0x1a, 0x98, 0x27, 0x29, 0x28, 0x6e, 0x84, + 0xd8, 0xe5, 0xf8, 0xa9, 0xcb, 0x0e, 0x1c, 0xfc, 0xbc, 0x87, 0x19, 0x47, 0x35, 0xb8, 0x1e, 0xbb, + 0x6f, 0x12, 0xaf, 0xa4, 0xad, 0x6a, 0xd5, 0xfc, 0xfa, 0xcd, 0xfe, 0x69, 0xa5, 0xb0, 0x31, 0x58, + 0x6f, 0xd4, 0x9d, 0x42, 0x6c, 0xd4, 0xf0, 0x90, 0x0d, 0x7a, 0x48, 0x29, 0xdf, 0x63, 0xa5, 0xf4, + 0x6a, 0xba, 0x5a, 0xa8, 0xfd, 0xdf, 0x4a, 0x04, 0x46, 0x9c, 0xce, 0xfa, 0x2a, 0xa2, 0xc4, 0x51, + 0x66, 0x68, 0x19, 0xb2, 0x8c, 0x7b, 0xc4, 0x2f, 0x65, 0x22, 0xef, 0x8e, 0x9c, 0xa0, 0x15, 0xd0, + 0x19, 0xf7, 0x68, 0x8f, 0x97, 0xb2, 0x62, 0x59, 0xcd, 0xd4, 0x3a, 0x0e, 0xc3, 0x92, 0x1e, 0xaf, + 0xe3, 0x30, 0x44, 0x06, 0xe4, 0x38, 0x0e, 0xbb, 0xc4, 0x77, 0x3b, 0xa5, 0x85, 0x55, 0xad, 0x9a, + 0x73, 0xe2, 0x39, 0x7a, 0x08, 0xd0, 0xda, 0xc7, 0xad, 0x83, 0x80, 0x12, 0x9f, 0x97, 0x72, 0xab, + 0x5a, 0xb5, 0x50, 0xbb, 0x33, 0x7a, 0xac, 0x7a, 0xcc, 0xb8, 0x93, 0xb0, 0x47, 0x16, 0x2c, 0xd0, + 0x80, 0x13, 0xea, 0xb3, 0x52, 0x5e, 0x40, 0x97, 0x2d, 0xc9, 0xa6, 0x35, 0x60, 0xd3, 0x7a, 0xe4, + 0x1f, 0x3b, 0x03, 0x23, 0xf3, 0x19, 0xa0, 0x24, 0x93, 0x2c, 0xa0, 0x3e, 0xc3, 0xaf, 0x45, 0xe5, + 0x12, 0xa4, 0x03, 0xe2, 0x95, 0x52, 0xab, 0x5a, 0x75, 0xd1, 0x89, 0x86, 0x66, 0x1b, 0xae, 0xef, + 0x70, 0x37, 0xe4, 0xf3, 0x04, 0xe8, 0x1d, 0x58, 0xc0, 0x47, 0xb8, 0xd5, 0x54, 0x9e, 0xf3, 0xeb, + 0xd0, 0x3f, 0xad, 0xe8, 0x9b, 0x47, 0xb8, 0xd5, 0xa8, 0x3b, 0x7a, 0xf4, 0xa9, 0xe1, 0x99, 0x6f, + 0xc3, 0xa2, 0xda, 0x48, 0x9d, 0x5f, 0x9d, 0x45, 0x3b, 0x3b, 0xcb, 0x16, 0x14, 0xeb, 0xb8, 0x83, + 0xe7, 0xce, 0x18, 0xf3, 0x57, 0x0d, 0x6e, 0x48, 0x4f, 0xf1, 0x6e, 0x2b, 0x90, 0x8a, 0xc1, 0x7a, + 0xff, 0xb4, 0x92, 0x6a, 0xd4, 0x9d, 0x14, 0xb9, 0x80, 0x11, 0x54, 0x81, 0x02, 0x3e, 0x22, 0xbc, + 0xc9, 0xb8, 0xcb, 0x7b, 0x51, 0xce, 0x45, 0x5f, 0x20, 0x5a, 0xda, 0x11, 0x2b, 0xe8, 0x11, 0xe4, + 0xa3, 0x19, 0xf6, 0x9a, 0x2e, 0x17, 0x29, 0x56, 0xa8, 0x19, 0x23, 0x01, 0x7c, 0x3a, 0x78, 0x0e, + 0xeb, 0xb9, 0x93, 0xd3, 0xca, 0xb5, 0x97, 0x7f, 0x55, 0x34, 0x27, 0x27, 0x61, 0x8f, 0xb8, 0x49, + 0x61, 0x59, 0x9e, 0x6f, 0x3b, 0xa4, 0x2d, 0xcc, 0xd8, 0x95, 0xb3, 0x5f, 0x87, 0x1b, 0x5b, 0x98, + 0xcf, 0xcb, 0xeb, 0x67, 0x70, 0x33, 0xf6, 0xa2, 0x78, 0x5d, 0x83, 0x4c, 0xa4, 0x0a, 0x02, 0x5e, + 0xa8, 0xdd, 0x4e, 0xbe, 0x81, 0xc3, 0x7b, 0xea, 0x19, 0x08, 0x80, 0x30, 0x33, 0xef, 0xc2, 0xd2, + 0x97, 0x84, 0x09, 0x17, 0xf1, 0xa5, 0x57, 0x40, 0xdf, 0x23, 0x1d, 0x8e, 0x43, 0x79, 0x06, 0x47, + 0xcd, 0xcc, 0x3a, 0x14, 0x13, 0xb6, 0x6a, 0x3f, 0x1b, 0xb2, 0x42, 0x82, 0x4b, 0x9a, 0xd0, 0x82, + 0x09, 0x1b, 0x4a, 0x3b, 0xf3, 0xa5, 0x06, 0x85, 0x2f, 0x48, 0xa7, 0x73, 0xd5, 0x14, 0x0b, 0x1d, + 0x21, 0xed, 0x48, 0x2d, 0x64, 0xca, 0xa8, 0x59, 0x94, 0x61, 0x6e, 0xa7, 0x23, 0x12, 0x25, 0xe7, + 0x44, 0x43, 0xf3, 0x1f, 0x0d, 0x50, 0x04, 0x7e, 0x03, 0xc1, 0x8f, 0xa5, 0x2e, 0x75, 0xb1, 0xd4, + 0xa5, 0xc7, 0x48, 0x5d, 0x66, 0xac, 0xd4, 0x65, 0x87, 0xa4, 0xae, 0x0a, 0x19, 0x16, 0xe0, 0x96, + 0x10, 0xc7, 0x71, 0x4a, 0x25, 0x2c, 0x92, 0x2c, 0x2d, 0x8c, 0x4d, 0xc4, 0x5b, 0xf0, 0xbf, 0x73, + 0x57, 0x97, 0x61, 0x35, 0x7f, 0xd6, 0x60, 0xc9, 0xc1, 0x8c, 0x7c, 0x8f, 0xb7, 0xf9, 0xf1, 0x95, + 0x87, 0x6a, 0x19, 0xb2, 0x2f, 0x88, 0xc7, 0xf7, 0x55, 0xa4, 0xe4, 0x24, 0x62, 0x67, 0x1f, 0x93, + 0xf6, 0xbe, 0x7c, 0xd4, 0x8b, 0x8e, 0x9a, 0x99, 0x3f, 0xc2, 0x8d, 0x8d, 0x0e, 0x65, 0xb8, 0xf1, + 0xf8, 0xbf, 0x38, 0x98, 0x0c, 0x67, 0x5a, 0x44, 0x41, 0x4e, 0xcc, 0xcf, 0x61, 0x69, 0xdb, 0xed, + 0xb1, 0xb9, 0x65, 0x71, 0x0b, 0x8a, 0x0e, 0x66, 0xbd, 0xee, 0xdc, 0x8e, 0x36, 0xe1, 0x66, 0xf4, + 0x32, 0xb7, 0x89, 0x37, 0x4f, 0xf2, 0x9a, 0xef, 0x4a, 0x31, 0x90, 0x6e, 0xd4, 0xfb, 0x46, 0x90, + 0x09, 0x88, 0x27, 0x9f, 0xf7, 0xa2, 0x23, 0xc6, 0xe6, 0x9f, 0x1a, 0xdc, 0xda, 0x88, 0xcb, 0xe7, + 0xbc, 0xed, 0x44, 0x13, 0x8a, 0x81, 0x1b, 0x62, 0x9f, 0x37, 0x13, 0x25, 0x5c, 0x86, 0xa4, 0x16, + 0x49, 0xf5, 0x1f, 0xa7, 0x95, 0xbb, 0x89, 0xc6, 0x88, 0x06, 0xd8, 0x8f, 0xe1, 0xcc, 0x6e, 0xd3, + 0x35, 0x8f, 0xb4, 0x31, 0xe3, 0x56, 0x5d, 0xfc, 0x72, 0x96, 0xa4, 0xb3, 0x8d, 0x0b, 0xcb, 0x7b, + 0x7a, 0x96, 0xf2, 0xfe, 0x2d, 0xac, 0x0c, 0xdf, 0x4e, 0x91, 0xf1, 0x29, 0x14, 0xce, 0x9a, 0xb6, + 0x81, 0xe4, 0x4d, 0xee, 0x33, 0x92, 0x00, 0xf3, 0x07, 0x28, 0x7e, 0x1d, 0x78, 0x6f, 0xa0, 0x05, + 0xab, 0x41, 0x3e, 0xc4, 0x8c, 0xf6, 0xc2, 0x16, 0x66, 0x82, 0xab, 0x71, 0x97, 0x3a, 0x33, 0xab, + 0xfd, 0x52, 0x80, 0xac, 0xd0, 0x6e, 0x74, 0x00, 0xba, 0xec, 0x5f, 0x90, 0x6d, 0x4d, 0xea, 0xa9, + 0xad, 0x91, 0x7e, 0xd1, 0xf8, 0x70, 0x76, 0x80, 0xe2, 0xec, 0x3b, 0xc8, 0x8a, 0x3e, 0x03, 0xdd, + 0x9d, 0x0c, 0x4d, 0x76, 0x3d, 0xc6, 0xfb, 0x33, 0xd9, 0xaa, 0x1d, 0xda, 0xa0, 0xcb, 0xe2, 0x3d, + 0xed, 0x3a, 0x23, 0xcd, 0x8c, 0xf1, 0xc1, 0x2c, 0x80, 0x78, 0xa3, 0xe7, 0xb0, 0x78, 0xae, 0x4b, + 0x40, 0xb5, 0x59, 0xe0, 0xe7, 0xab, 0xca, 0x25, 0xb7, 0xdc, 0x85, 0xf4, 0x16, 0xe6, 0x68, 0x0a, + 0xe8, 0x7c, 0x2b, 0x61, 0xac, 0xcd, 0x68, 0x1d, 0xf3, 0x97, 0x89, 0x9e, 0x3d, 0xb2, 0x26, 0xc3, + 0x86, 0xfb, 0x04, 0xc3, 0x9e, 0xd9, 0x5e, 0x6d, 0xd4, 0x80, 0x4c, 0x54, 0xf9, 0xd1, 0x7b, 0x93, + 0x81, 0x89, 0xee, 0xc0, 0x58, 0x19, 0xc9, 0xea, 0xcd, 0xe8, 0xcf, 0x3a, 0xb4, 0x0d, 0x99, 0x48, + 0xaa, 0xd1, 0x94, 0x7c, 0x1c, 0xad, 0xea, 0x63, 0x3d, 0xee, 0x40, 0x3e, 0x2e, 0x78, 0xd3, 0xa8, + 0x18, 0xae, 0x8c, 0x63, 0x9d, 0x3e, 0x86, 0x05, 0x55, 0xaa, 0xa6, 0x85, 0xf0, 0x7c, 0x45, 0x9b, + 0xe0, 0x30, 0x2b, 0x4a, 0xcf, 0xb4, 0x13, 0x0e, 0xd7, 0xa7, 0xb1, 0x0e, 0x9f, 0x80, 0x2e, 0x6b, + 0xd0, 0xb4, 0xc7, 0x33, 0x52, 0xa9, 0xc6, 0xba, 0x24, 0x90, 0x1b, 0x94, 0x11, 0xb4, 0x36, 0x3d, + 0x47, 0x12, 0x55, 0xcb, 0xb0, 0x66, 0x35, 0x57, 0x19, 0xf5, 0x02, 0x20, 0x21, 0xf4, 0xf7, 0xa7, + 0x50, 0x7c, 0x51, 0xc9, 0x32, 0x3e, 0xba, 0x1c, 0x48, 0x6d, 0xfc, 0x04, 0x74, 0xa9, 0xe4, 0xd3, + 0x68, 0x1b, 0xd1, 0xfb, 0x71, 0xb4, 0xad, 0x7f, 0x73, 0xf2, 0xaa, 0x7c, 0xed, 0xf7, 0x57, 0xe5, + 0x6b, 0x3f, 0xf5, 0xcb, 0xda, 0x49, 0xbf, 0xac, 0xfd, 0xd6, 0x2f, 0x6b, 0x7f, 0xf7, 0xcb, 0xda, + 0xb3, 0x87, 0xaf, 0xf7, 0xcf, 0x93, 0x07, 0x62, 0xb0, 0xab, 0x8b, 0x7d, 0xee, 0xff, 0x1b, 0x00, + 0x00, 0xff, 0xff, 0x55, 0x8b, 0x54, 0x53, 0x83, 0x11, 0x00, 0x00, } diff --git a/api/services/tasks/v1/tasks.proto b/api/services/tasks/v1/tasks.proto index b6a8edb5c..a36267900 100644 --- a/api/services/tasks/v1/tasks.proto +++ b/api/services/tasks/v1/tasks.proto @@ -16,8 +16,8 @@ service Tasks { // Create a task. rpc Create(CreateTaskRequest) returns (CreateTaskResponse); - // Start a task. - rpc Start(StartTaskRequest) returns (google.protobuf.Empty); + // Start a process. + rpc Start(StartRequest) returns (StartResponse); // Delete a task and on disk state. rpc Delete(DeleteTaskRequest) returns (DeleteResponse); @@ -31,7 +31,7 @@ service Tasks { // Kill a task or process. rpc Kill(KillRequest) returns (google.protobuf.Empty); - rpc Exec(ExecProcessRequest) returns (ExecProcessResponse); + rpc Exec(ExecProcessRequest) returns (google.protobuf.Empty); rpc ResizePty(ResizePtyRequest) returns (google.protobuf.Empty); @@ -74,8 +74,13 @@ message CreateTaskResponse { uint32 pid = 2; } -message StartTaskRequest { +message StartRequest { string container_id = 1; + string exec_id = 2; +} + +message StartResponse { + uint32 pid = 1; } message DeleteTaskRequest { @@ -132,7 +137,6 @@ message ExecProcessRequest { } message ExecProcessResponse { - uint32 pid = 1; } message ResizePtyRequest { diff --git a/container_test.go b/container_test.go index 2b423285f..a44c1f263 100644 --- a/container_test.go +++ b/container_test.go @@ -869,7 +869,7 @@ func TestContainerExecNoBinaryExists(t *testing.T) { close(finished) }() - // start an exec process without running the original container process info + // start an exec process without running the original container process processSpec := spec.Process processSpec.Args = []string{ "none", diff --git a/linux/process.go b/linux/process.go index 3c22574fc..337bc41bb 100644 --- a/linux/process.go +++ b/linux/process.go @@ -79,7 +79,17 @@ func (p *Process) CloseIO(ctx context.Context) error { Stdin: true, }) if err != nil { - err = errdefs.FromGRPC(err) + return errdefs.FromGRPC(err) } - return err + return nil +} + +func (p *Process) Start(ctx context.Context) error { + _, err := p.t.shim.Start(ctx, &shim.StartRequest{ + ID: p.id, + }) + if err != nil { + return errdefs.FromGRPC(err) + } + return nil } diff --git a/linux/task.go b/linux/task.go index 51a85079b..b0aadb6e5 100644 --- a/linux/task.go +++ b/linux/task.go @@ -118,11 +118,6 @@ func (t *Task) Exec(ctx context.Context, id string, opts runtime.ExecOpts) (runt if _, err := t.shim.Exec(ctx, request); err != nil { return nil, errdefs.FromGRPC(err) } - if _, err := t.shim.Start(ctx, &shim.StartRequest{ - ID: id, - }); err != nil { - return nil, errdefs.FromGRPC(err) - } return &Process{ id: id, t: t, diff --git a/process.go b/process.go index 440be26ea..0ca6f23a6 100644 --- a/process.go +++ b/process.go @@ -31,27 +31,17 @@ func (p *process) Pid() uint32 { // Start starts the exec process func (p *process) Start(ctx context.Context) error { - any, err := typeurl.MarshalAny(p.spec) - if err != nil { - return err - } - request := &tasks.ExecProcessRequest{ + r, err := p.task.client.TaskService().Start(ctx, &tasks.StartRequest{ ContainerID: p.task.id, ExecID: p.id, - Terminal: p.io.Terminal, - Stdin: p.io.Stdin, - Stdout: p.io.Stdout, - Stderr: p.io.Stderr, - Spec: any, - } - response, err := p.task.client.TaskService().Exec(ctx, request) + }) if err != nil { p.io.Cancel() p.io.Wait() p.io.Close() return err } - p.pid = response.Pid + p.pid = r.Pid return nil } diff --git a/runtime/task.go b/runtime/task.go index 8d3c5b5c5..612d54523 100644 --- a/runtime/task.go +++ b/runtime/task.go @@ -23,6 +23,8 @@ type Process interface { ResizePty(context.Context, ConsoleSize) error // CloseStdin closes the processes stdin CloseIO(context.Context) error + // Start the container's user defined process + Start(context.Context) error } type Task interface { @@ -30,8 +32,6 @@ type Task interface { // Information of the container Info() TaskInfo - // Start the container's user defined process - Start(context.Context) error // Pause pauses the container process Pause(context.Context) error // Resume unpauses the container process diff --git a/services/tasks/service.go b/services/tasks/service.go index a6764ccdb..9ceadb5a6 100644 --- a/services/tasks/service.go +++ b/services/tasks/service.go @@ -152,16 +152,27 @@ func (s *Service) Create(ctx context.Context, r *api.CreateTaskRequest) (*api.Cr }, nil } -func (s *Service) Start(ctx context.Context, r *api.StartTaskRequest) (*google_protobuf.Empty, error) { +func (s *Service) Start(ctx context.Context, r *api.StartRequest) (*api.StartResponse, error) { t, err := s.getTask(ctx, r.ContainerID) if err != nil { return nil, err } - if err := t.Start(ctx); err != nil { + p := runtime.Process(t) + if r.ExecID != "" { + if p, err = t.Process(ctx, r.ExecID); err != nil { + return nil, err + } + } + if err := p.Start(ctx); err != nil { return nil, err } - - return empty, nil + state, err := p.State(ctx) + if err != nil { + return nil, err + } + return &api.StartResponse{ + Pid: state.Pid, + }, nil } func (s *Service) Delete(ctx context.Context, r *api.DeleteTaskRequest) (*api.DeleteResponse, error) { @@ -317,7 +328,7 @@ func (s *Service) ListPids(ctx context.Context, r *api.ListPidsRequest) (*api.Li }, nil } -func (s *Service) Exec(ctx context.Context, r *api.ExecProcessRequest) (*api.ExecProcessResponse, error) { +func (s *Service) Exec(ctx context.Context, r *api.ExecProcessRequest) (*google_protobuf.Empty, error) { if r.ExecID == "" { return nil, grpc.Errorf(codes.InvalidArgument, "exec id cannot be empty") } @@ -325,7 +336,7 @@ func (s *Service) Exec(ctx context.Context, r *api.ExecProcessRequest) (*api.Exe if err != nil { return nil, err } - process, err := t.Exec(ctx, r.ExecID, runtime.ExecOpts{ + if _, err := t.Exec(ctx, r.ExecID, runtime.ExecOpts{ Spec: r.Spec, IO: runtime.IO{ Stdin: r.Stdin, @@ -333,17 +344,10 @@ func (s *Service) Exec(ctx context.Context, r *api.ExecProcessRequest) (*api.Exe Stderr: r.Stderr, Terminal: r.Terminal, }, - }) - if err != nil { + }); err != nil { return nil, err } - state, err := process.State(ctx) - if err != nil { - return nil, err - } - return &api.ExecProcessResponse{ - Pid: state.Pid, - }, nil + return empty, nil } func (s *Service) ResizePty(ctx context.Context, r *api.ResizePtyRequest) (*google_protobuf.Empty, error) { diff --git a/task.go b/task.go index 640506497..4cb47d931 100644 --- a/task.go +++ b/task.go @@ -118,7 +118,7 @@ func (t *task) Start(ctx context.Context) error { t.pid = response.Pid return nil } - _, err := t.client.TaskService().Start(ctx, &tasks.StartTaskRequest{ + _, err := t.client.TaskService().Start(ctx, &tasks.StartRequest{ ContainerID: t.id, }) if err != nil { @@ -214,6 +214,25 @@ func (t *task) Exec(ctx context.Context, id string, spec *specs.Process, ioCreat if err != nil { return nil, err } + any, err := typeurl.MarshalAny(spec) + if err != nil { + return nil, err + } + request := &tasks.ExecProcessRequest{ + ContainerID: t.id, + ExecID: id, + Terminal: i.Terminal, + Stdin: i.Stdin, + Stdout: i.Stdout, + Stderr: i.Stderr, + Spec: any, + } + if _, err := t.client.TaskService().Exec(ctx, request); err != nil { + i.Cancel() + i.Wait() + i.Close() + return nil, err + } return &process{ id: id, task: t,