diff --git a/api/services/execution/execution.pb.go b/api/services/tasks/tasks.pb.go similarity index 84% rename from api/services/execution/execution.pb.go rename to api/services/tasks/tasks.pb.go index 243e129a2..304751176 100644 --- a/api/services/execution/execution.pb.go +++ b/api/services/tasks/tasks.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. -// source: github.com/containerd/containerd/api/services/execution/execution.proto +// source: github.com/containerd/containerd/api/services/tasks/tasks.proto // DO NOT EDIT! /* - Package execution is a generated protocol buffer package. + Package tasks is a generated protocol buffer package. It is generated from these files: - github.com/containerd/containerd/api/services/execution/execution.proto + github.com/containerd/containerd/api/services/tasks/tasks.proto It has these top-level messages: CreateTaskRequest @@ -31,7 +31,7 @@ CheckpointTaskRequest CheckpointTaskResponse */ -package execution +package tasks import proto "github.com/gogo/protobuf/proto" import fmt "fmt" @@ -95,7 +95,7 @@ type CreateTaskRequest struct { func (m *CreateTaskRequest) Reset() { *m = CreateTaskRequest{} } func (*CreateTaskRequest) ProtoMessage() {} -func (*CreateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{0} } +func (*CreateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{0} } type CreateTaskResponse struct { ContainerID string `protobuf:"bytes,2,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -104,7 +104,7 @@ type CreateTaskResponse struct { func (m *CreateTaskResponse) Reset() { *m = CreateTaskResponse{} } func (*CreateTaskResponse) ProtoMessage() {} -func (*CreateTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{1} } +func (*CreateTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{1} } type StartTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -112,7 +112,7 @@ type StartTaskRequest struct { func (m *StartTaskRequest) Reset() { *m = StartTaskRequest{} } func (*StartTaskRequest) ProtoMessage() {} -func (*StartTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{2} } +func (*StartTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{2} } type DeleteTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -120,7 +120,7 @@ type DeleteTaskRequest struct { func (m *DeleteTaskRequest) Reset() { *m = DeleteTaskRequest{} } func (*DeleteTaskRequest) ProtoMessage() {} -func (*DeleteTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{3} } +func (*DeleteTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{3} } type DeleteResponse struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -131,7 +131,7 @@ type DeleteResponse struct { func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (*DeleteResponse) ProtoMessage() {} -func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{4} } +func (*DeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{4} } type DeleteProcessRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -140,7 +140,7 @@ type DeleteProcessRequest struct { func (m *DeleteProcessRequest) Reset() { *m = DeleteProcessRequest{} } func (*DeleteProcessRequest) ProtoMessage() {} -func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{5} } +func (*DeleteProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{5} } type GetTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -148,7 +148,7 @@ type GetTaskRequest struct { func (m *GetTaskRequest) Reset() { *m = GetTaskRequest{} } func (*GetTaskRequest) ProtoMessage() {} -func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{6} } +func (*GetTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{6} } type GetTaskResponse struct { Task *containerd_v1_types2.Task `protobuf:"bytes,1,opt,name=task" json:"task,omitempty"` @@ -156,7 +156,7 @@ type GetTaskResponse struct { func (m *GetTaskResponse) Reset() { *m = GetTaskResponse{} } func (*GetTaskResponse) ProtoMessage() {} -func (*GetTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{7} } +func (*GetTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{7} } type ListTasksRequest struct { Filter string `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` @@ -164,7 +164,7 @@ type ListTasksRequest struct { func (m *ListTasksRequest) Reset() { *m = ListTasksRequest{} } func (*ListTasksRequest) ProtoMessage() {} -func (*ListTasksRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{8} } +func (*ListTasksRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{8} } type ListTasksResponse struct { Tasks []*containerd_v1_types2.Task `protobuf:"bytes,1,rep,name=tasks" json:"tasks,omitempty"` @@ -172,7 +172,7 @@ type ListTasksResponse struct { func (m *ListTasksResponse) Reset() { *m = ListTasksResponse{} } func (*ListTasksResponse) ProtoMessage() {} -func (*ListTasksResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{9} } +func (*ListTasksResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{9} } type KillRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -185,7 +185,7 @@ type KillRequest struct { func (m *KillRequest) Reset() { *m = KillRequest{} } func (*KillRequest) ProtoMessage() {} -func (*KillRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{10} } +func (*KillRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{10} } type isKillRequest_PidOrAll interface { isKillRequest_PidOrAll() @@ -307,7 +307,7 @@ type ExecProcessRequest struct { func (m *ExecProcessRequest) Reset() { *m = ExecProcessRequest{} } func (*ExecProcessRequest) ProtoMessage() {} -func (*ExecProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{11} } +func (*ExecProcessRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{11} } type ExecProcessResponse struct { Pid uint32 `protobuf:"varint,1,opt,name=pid,proto3" json:"pid,omitempty"` @@ -315,7 +315,7 @@ type ExecProcessResponse struct { func (m *ExecProcessResponse) Reset() { *m = ExecProcessResponse{} } func (*ExecProcessResponse) ProtoMessage() {} -func (*ExecProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{12} } +func (*ExecProcessResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{12} } type ResizePtyRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -326,7 +326,7 @@ type ResizePtyRequest struct { func (m *ResizePtyRequest) Reset() { *m = ResizePtyRequest{} } func (*ResizePtyRequest) ProtoMessage() {} -func (*ResizePtyRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{13} } +func (*ResizePtyRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{13} } type CloseIORequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -336,7 +336,7 @@ type CloseIORequest struct { func (m *CloseIORequest) Reset() { *m = CloseIORequest{} } func (*CloseIORequest) ProtoMessage() {} -func (*CloseIORequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{14} } +func (*CloseIORequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{14} } type PauseTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -344,7 +344,7 @@ type PauseTaskRequest struct { func (m *PauseTaskRequest) Reset() { *m = PauseTaskRequest{} } func (*PauseTaskRequest) ProtoMessage() {} -func (*PauseTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{15} } +func (*PauseTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{15} } type ResumeTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -352,7 +352,7 @@ type ResumeTaskRequest struct { func (m *ResumeTaskRequest) Reset() { *m = ResumeTaskRequest{} } func (*ResumeTaskRequest) ProtoMessage() {} -func (*ResumeTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{16} } +func (*ResumeTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{16} } type ListProcessesRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -360,7 +360,7 @@ type ListProcessesRequest struct { func (m *ListProcessesRequest) Reset() { *m = ListProcessesRequest{} } func (*ListProcessesRequest) ProtoMessage() {} -func (*ListProcessesRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{17} } +func (*ListProcessesRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{17} } type ListProcessesResponse struct { Processes []*containerd_v1_types2.Process `protobuf:"bytes,1,rep,name=processes" json:"processes,omitempty"` @@ -368,7 +368,7 @@ type ListProcessesResponse struct { func (m *ListProcessesResponse) Reset() { *m = ListProcessesResponse{} } func (*ListProcessesResponse) ProtoMessage() {} -func (*ListProcessesResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{18} } +func (*ListProcessesResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{18} } type CheckpointTaskRequest struct { ContainerID string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` @@ -378,7 +378,7 @@ type CheckpointTaskRequest struct { func (m *CheckpointTaskRequest) Reset() { *m = CheckpointTaskRequest{} } func (*CheckpointTaskRequest) ProtoMessage() {} -func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{19} } +func (*CheckpointTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{19} } type CheckpointTaskResponse struct { Descriptors []*containerd_v1_types1.Descriptor `protobuf:"bytes,1,rep,name=descriptors" json:"descriptors,omitempty"` @@ -386,7 +386,7 @@ type CheckpointTaskResponse struct { func (m *CheckpointTaskResponse) Reset() { *m = CheckpointTaskResponse{} } func (*CheckpointTaskResponse) ProtoMessage() {} -func (*CheckpointTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorExecution, []int{20} } +func (*CheckpointTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorTasks, []int{20} } func init() { proto.RegisterType((*CreateTaskRequest)(nil), "containerd.services.tasks.v1.CreateTaskRequest") @@ -918,7 +918,7 @@ var _Tasks_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "github.com/containerd/containerd/api/services/execution/execution.proto", + Metadata: "github.com/containerd/containerd/api/services/tasks/tasks.proto", } func (m *CreateTaskRequest) Marshal() (dAtA []byte, err error) { @@ -939,14 +939,14 @@ func (m *CreateTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if len(m.Rootfs) > 0 { for _, msg := range m.Rootfs { dAtA[i] = 0x1a i++ - i = encodeVarintExecution(dAtA, i, uint64(msg.Size())) + i = encodeVarintTasks(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -957,19 +957,19 @@ func (m *CreateTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.Stdin) > 0 { dAtA[i] = 0x22 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Stdin))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Stdin))) i += copy(dAtA[i:], m.Stdin) } if len(m.Stdout) > 0 { dAtA[i] = 0x2a i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Stdout))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Stdout))) i += copy(dAtA[i:], m.Stdout) } if len(m.Stderr) > 0 { dAtA[i] = 0x32 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Stderr))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Stderr))) i += copy(dAtA[i:], m.Stderr) } if m.Terminal { @@ -985,7 +985,7 @@ func (m *CreateTaskRequest) MarshalTo(dAtA []byte) (int, error) { if m.Checkpoint != nil { dAtA[i] = 0x42 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Checkpoint.Size())) + i = encodeVarintTasks(dAtA, i, uint64(m.Checkpoint.Size())) n1, err := m.Checkpoint.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -1013,13 +1013,13 @@ func (m *CreateTaskResponse) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if m.Pid != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) } return i, nil } @@ -1042,7 +1042,7 @@ func (m *StartTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } return i, nil @@ -1066,7 +1066,7 @@ func (m *DeleteTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } return i, nil @@ -1090,22 +1090,22 @@ func (m *DeleteResponse) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if m.Pid != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) } if m.ExitStatus != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.ExitStatus)) + i = encodeVarintTasks(dAtA, i, uint64(m.ExitStatus)) } dAtA[i] = 0x22 i++ - i = encodeVarintExecution(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt))) + i = encodeVarintTasks(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt))) n2, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.ExitedAt, dAtA[i:]) if err != nil { return 0, err @@ -1132,13 +1132,13 @@ func (m *DeleteProcessRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if m.Pid != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) } return i, nil } @@ -1161,7 +1161,7 @@ func (m *GetTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } return i, nil @@ -1185,7 +1185,7 @@ func (m *GetTaskResponse) MarshalTo(dAtA []byte) (int, error) { if m.Task != nil { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Task.Size())) + i = encodeVarintTasks(dAtA, i, uint64(m.Task.Size())) n3, err := m.Task.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -1213,7 +1213,7 @@ func (m *ListTasksRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.Filter) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Filter))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Filter))) i += copy(dAtA[i:], m.Filter) } return i, nil @@ -1238,7 +1238,7 @@ func (m *ListTasksResponse) MarshalTo(dAtA []byte) (int, error) { for _, msg := range m.Tasks { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(msg.Size())) + i = encodeVarintTasks(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -1267,13 +1267,13 @@ func (m *KillRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if m.Signal != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Signal)) + i = encodeVarintTasks(dAtA, i, uint64(m.Signal)) } if m.PidOrAll != nil { nn4, err := m.PidOrAll.MarshalTo(dAtA[i:]) @@ -1301,7 +1301,7 @@ func (m *KillRequest_Pid) MarshalTo(dAtA []byte) (int, error) { i := 0 dAtA[i] = 0x20 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) return i, nil } func (m *ExecProcessRequest) Marshal() (dAtA []byte, err error) { @@ -1322,25 +1322,25 @@ func (m *ExecProcessRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if len(m.Stdin) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Stdin))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Stdin))) i += copy(dAtA[i:], m.Stdin) } if len(m.Stdout) > 0 { dAtA[i] = 0x1a i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Stdout))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Stdout))) i += copy(dAtA[i:], m.Stdout) } if len(m.Stderr) > 0 { dAtA[i] = 0x22 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.Stderr))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.Stderr))) i += copy(dAtA[i:], m.Stderr) } if m.Terminal { @@ -1356,7 +1356,7 @@ func (m *ExecProcessRequest) MarshalTo(dAtA []byte) (int, error) { if m.Spec != nil { dAtA[i] = 0x32 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Spec.Size())) + i = encodeVarintTasks(dAtA, i, uint64(m.Spec.Size())) n5, err := m.Spec.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -1384,7 +1384,7 @@ func (m *ExecProcessResponse) MarshalTo(dAtA []byte) (int, error) { if m.Pid != 0 { dAtA[i] = 0x8 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) } return i, nil } @@ -1407,23 +1407,23 @@ func (m *ResizePtyRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if m.Pid != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) } if m.Width != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Width)) + i = encodeVarintTasks(dAtA, i, uint64(m.Width)) } if m.Height != 0 { dAtA[i] = 0x20 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Height)) + i = encodeVarintTasks(dAtA, i, uint64(m.Height)) } return i, nil } @@ -1446,13 +1446,13 @@ func (m *CloseIORequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if m.Pid != 0 { dAtA[i] = 0x10 i++ - i = encodeVarintExecution(dAtA, i, uint64(m.Pid)) + i = encodeVarintTasks(dAtA, i, uint64(m.Pid)) } if m.Stdin { dAtA[i] = 0x18 @@ -1485,7 +1485,7 @@ func (m *PauseTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } return i, nil @@ -1509,7 +1509,7 @@ func (m *ResumeTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } return i, nil @@ -1533,7 +1533,7 @@ func (m *ListProcessesRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } return i, nil @@ -1558,7 +1558,7 @@ func (m *ListProcessesResponse) MarshalTo(dAtA []byte) (int, error) { for _, msg := range m.Processes { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(msg.Size())) + i = encodeVarintTasks(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -1587,13 +1587,13 @@ func (m *CheckpointTaskRequest) MarshalTo(dAtA []byte) (int, error) { if len(m.ContainerID) > 0 { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ContainerID))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ContainerID))) i += copy(dAtA[i:], m.ContainerID) } if len(m.ParentCheckpoint) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(m.ParentCheckpoint))) + i = encodeVarintTasks(dAtA, i, uint64(len(m.ParentCheckpoint))) i += copy(dAtA[i:], m.ParentCheckpoint) } if len(m.Options) > 0 { @@ -1601,15 +1601,15 @@ func (m *CheckpointTaskRequest) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ v := m.Options[k] - mapSize := 1 + len(k) + sovExecution(uint64(len(k))) + 1 + len(v) + sovExecution(uint64(len(v))) - i = encodeVarintExecution(dAtA, i, uint64(mapSize)) + mapSize := 1 + len(k) + sovTasks(uint64(len(k))) + 1 + len(v) + sovTasks(uint64(len(v))) + i = encodeVarintTasks(dAtA, i, uint64(mapSize)) dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(len(k))) + i = encodeVarintTasks(dAtA, i, uint64(len(k))) i += copy(dAtA[i:], k) dAtA[i] = 0x12 i++ - i = encodeVarintExecution(dAtA, i, uint64(len(v))) + i = encodeVarintTasks(dAtA, i, uint64(len(v))) i += copy(dAtA[i:], v) } } @@ -1635,7 +1635,7 @@ func (m *CheckpointTaskResponse) MarshalTo(dAtA []byte) (int, error) { for _, msg := range m.Descriptors { dAtA[i] = 0xa i++ - i = encodeVarintExecution(dAtA, i, uint64(msg.Size())) + i = encodeVarintTasks(dAtA, i, uint64(msg.Size())) n, err := msg.MarshalTo(dAtA[i:]) if err != nil { return 0, err @@ -1646,7 +1646,7 @@ func (m *CheckpointTaskResponse) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func encodeFixed64Execution(dAtA []byte, offset int, v uint64) int { +func encodeFixed64Tasks(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) dAtA[offset+1] = uint8(v >> 8) dAtA[offset+2] = uint8(v >> 16) @@ -1657,14 +1657,14 @@ func encodeFixed64Execution(dAtA []byte, offset int, v uint64) int { dAtA[offset+7] = uint8(v >> 56) return offset + 8 } -func encodeFixed32Execution(dAtA []byte, offset int, v uint32) int { +func encodeFixed32Tasks(dAtA []byte, offset int, v uint32) int { dAtA[offset] = uint8(v) dAtA[offset+1] = uint8(v >> 8) dAtA[offset+2] = uint8(v >> 16) dAtA[offset+3] = uint8(v >> 24) return offset + 4 } -func encodeVarintExecution(dAtA []byte, offset int, v uint64) int { +func encodeVarintTasks(dAtA []byte, offset int, v uint64) int { for v >= 1<<7 { dAtA[offset] = uint8(v&0x7f | 0x80) v >>= 7 @@ -1678,32 +1678,32 @@ func (m *CreateTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if len(m.Rootfs) > 0 { for _, e := range m.Rootfs { l = e.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } } l = len(m.Stdin) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } l = len(m.Stdout) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } l = len(m.Stderr) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Terminal { n += 2 } if m.Checkpoint != nil { l = m.Checkpoint.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1713,10 +1713,10 @@ func (m *CreateTaskResponse) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Pid != 0 { - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) } return n } @@ -1726,7 +1726,7 @@ func (m *StartTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1736,7 +1736,7 @@ func (m *DeleteTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1746,16 +1746,16 @@ func (m *DeleteResponse) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Pid != 0 { - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) } if m.ExitStatus != 0 { - n += 1 + sovExecution(uint64(m.ExitStatus)) + n += 1 + sovTasks(uint64(m.ExitStatus)) } l = github_com_gogo_protobuf_types.SizeOfStdTime(m.ExitedAt) - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) return n } @@ -1764,10 +1764,10 @@ func (m *DeleteProcessRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Pid != 0 { - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) } return n } @@ -1777,7 +1777,7 @@ func (m *GetTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1787,7 +1787,7 @@ func (m *GetTaskResponse) Size() (n int) { _ = l if m.Task != nil { l = m.Task.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1797,7 +1797,7 @@ func (m *ListTasksRequest) Size() (n int) { _ = l l = len(m.Filter) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1808,7 +1808,7 @@ func (m *ListTasksResponse) Size() (n int) { if len(m.Tasks) > 0 { for _, e := range m.Tasks { l = e.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } } return n @@ -1819,10 +1819,10 @@ func (m *KillRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Signal != 0 { - n += 1 + sovExecution(uint64(m.Signal)) + n += 1 + sovTasks(uint64(m.Signal)) } if m.PidOrAll != nil { n += m.PidOrAll.Size() @@ -1839,7 +1839,7 @@ func (m *KillRequest_All) Size() (n int) { func (m *KillRequest_Pid) Size() (n int) { var l int _ = l - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) return n } func (m *ExecProcessRequest) Size() (n int) { @@ -1847,26 +1847,26 @@ func (m *ExecProcessRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } l = len(m.Stdin) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } l = len(m.Stdout) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } l = len(m.Stderr) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Terminal { n += 2 } if m.Spec != nil { l = m.Spec.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1875,7 +1875,7 @@ func (m *ExecProcessResponse) Size() (n int) { var l int _ = l if m.Pid != 0 { - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) } return n } @@ -1885,16 +1885,16 @@ func (m *ResizePtyRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Pid != 0 { - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) } if m.Width != 0 { - n += 1 + sovExecution(uint64(m.Width)) + n += 1 + sovTasks(uint64(m.Width)) } if m.Height != 0 { - n += 1 + sovExecution(uint64(m.Height)) + n += 1 + sovTasks(uint64(m.Height)) } return n } @@ -1904,10 +1904,10 @@ func (m *CloseIORequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if m.Pid != 0 { - n += 1 + sovExecution(uint64(m.Pid)) + n += 1 + sovTasks(uint64(m.Pid)) } if m.Stdin { n += 2 @@ -1920,7 +1920,7 @@ func (m *PauseTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1930,7 +1930,7 @@ func (m *ResumeTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1940,7 +1940,7 @@ func (m *ListProcessesRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } return n } @@ -1951,7 +1951,7 @@ func (m *ListProcessesResponse) Size() (n int) { if len(m.Processes) > 0 { for _, e := range m.Processes { l = e.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } } return n @@ -1962,18 +1962,18 @@ func (m *CheckpointTaskRequest) Size() (n int) { _ = l l = len(m.ContainerID) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } l = len(m.ParentCheckpoint) if l > 0 { - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } if len(m.Options) > 0 { for k, v := range m.Options { _ = k _ = v - mapEntrySize := 1 + len(k) + sovExecution(uint64(len(k))) + 1 + len(v) + sovExecution(uint64(len(v))) - n += mapEntrySize + 1 + sovExecution(uint64(mapEntrySize)) + mapEntrySize := 1 + len(k) + sovTasks(uint64(len(k))) + 1 + len(v) + sovTasks(uint64(len(v))) + n += mapEntrySize + 1 + sovTasks(uint64(mapEntrySize)) } } return n @@ -1985,13 +1985,13 @@ func (m *CheckpointTaskResponse) Size() (n int) { if len(m.Descriptors) > 0 { for _, e := range m.Descriptors { l = e.Size() - n += 1 + l + sovExecution(uint64(l)) + n += 1 + l + sovTasks(uint64(l)) } } return n } -func sovExecution(x uint64) (n int) { +func sovTasks(x uint64) (n int) { for { n++ x >>= 7 @@ -2001,8 +2001,8 @@ func sovExecution(x uint64) (n int) { } return n } -func sozExecution(x uint64) (n int) { - return sovExecution(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +func sozTasks(x uint64) (n int) { + return sovTasks(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } func (this *CreateTaskRequest) String() string { if this == nil { @@ -2269,7 +2269,7 @@ func (this *CheckpointTaskResponse) String() string { }, "") return s } -func valueToStringExecution(v interface{}) string { +func valueToStringTasks(v interface{}) string { rv := reflect.ValueOf(v) if rv.IsNil() { return "nil" @@ -2285,7 +2285,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2313,7 +2313,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2327,7 +2327,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2342,7 +2342,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2355,7 +2355,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -2373,7 +2373,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2387,7 +2387,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2402,7 +2402,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2416,7 +2416,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2431,7 +2431,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2445,7 +2445,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2460,7 +2460,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2480,7 +2480,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2493,7 +2493,7 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -2508,12 +2508,12 @@ func (m *CreateTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -2535,7 +2535,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2563,7 +2563,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2577,7 +2577,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2592,7 +2592,7 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2606,12 +2606,12 @@ func (m *CreateTaskResponse) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -2633,7 +2633,7 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2661,7 +2661,7 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2675,7 +2675,7 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2685,12 +2685,12 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -2712,7 +2712,7 @@ func (m *DeleteTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2740,7 +2740,7 @@ func (m *DeleteTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2754,7 +2754,7 @@ func (m *DeleteTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2764,12 +2764,12 @@ func (m *DeleteTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -2791,7 +2791,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2819,7 +2819,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2833,7 +2833,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2848,7 +2848,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2867,7 +2867,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { m.ExitStatus = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2886,7 +2886,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2899,7 +2899,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -2911,12 +2911,12 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -2938,7 +2938,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2966,7 +2966,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -2980,7 +2980,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -2995,7 +2995,7 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3009,12 +3009,12 @@ func (m *DeleteProcessRequest) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3036,7 +3036,7 @@ func (m *GetTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3064,7 +3064,7 @@ func (m *GetTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3078,7 +3078,7 @@ func (m *GetTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3088,12 +3088,12 @@ func (m *GetTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3115,7 +3115,7 @@ func (m *GetTaskResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3143,7 +3143,7 @@ func (m *GetTaskResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3156,7 +3156,7 @@ func (m *GetTaskResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -3171,12 +3171,12 @@ func (m *GetTaskResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3198,7 +3198,7 @@ func (m *ListTasksRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3226,7 +3226,7 @@ func (m *ListTasksRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3240,7 +3240,7 @@ func (m *ListTasksRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3250,12 +3250,12 @@ func (m *ListTasksRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3277,7 +3277,7 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3305,7 +3305,7 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3318,7 +3318,7 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -3331,12 +3331,12 @@ func (m *ListTasksResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3358,7 +3358,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3386,7 +3386,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3400,7 +3400,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3415,7 +3415,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { m.Signal = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3434,7 +3434,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3455,7 +3455,7 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { var v uint32 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3470,12 +3470,12 @@ func (m *KillRequest) Unmarshal(dAtA []byte) error { m.PidOrAll = &KillRequest_Pid{v} default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3497,7 +3497,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3525,7 +3525,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3539,7 +3539,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3554,7 +3554,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3568,7 +3568,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3583,7 +3583,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3597,7 +3597,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3612,7 +3612,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3626,7 +3626,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3641,7 +3641,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3661,7 +3661,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3674,7 +3674,7 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -3689,12 +3689,12 @@ func (m *ExecProcessRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3716,7 +3716,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3744,7 +3744,7 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3758,12 +3758,12 @@ func (m *ExecProcessResponse) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3785,7 +3785,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3813,7 +3813,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3827,7 +3827,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3842,7 +3842,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3861,7 +3861,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { m.Width = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3880,7 +3880,7 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { m.Height = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3894,12 +3894,12 @@ func (m *ResizePtyRequest) Unmarshal(dAtA []byte) error { } default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -3921,7 +3921,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3949,7 +3949,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3963,7 +3963,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -3978,7 +3978,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { m.Pid = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -3997,7 +3997,7 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4012,12 +4012,12 @@ func (m *CloseIORequest) Unmarshal(dAtA []byte) error { m.Stdin = bool(v != 0) default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4039,7 +4039,7 @@ func (m *PauseTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4067,7 +4067,7 @@ func (m *PauseTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4081,7 +4081,7 @@ func (m *PauseTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -4091,12 +4091,12 @@ func (m *PauseTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4118,7 +4118,7 @@ func (m *ResumeTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4146,7 +4146,7 @@ func (m *ResumeTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4160,7 +4160,7 @@ func (m *ResumeTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -4170,12 +4170,12 @@ func (m *ResumeTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4197,7 +4197,7 @@ func (m *ListProcessesRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4225,7 +4225,7 @@ func (m *ListProcessesRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4239,7 +4239,7 @@ func (m *ListProcessesRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -4249,12 +4249,12 @@ func (m *ListProcessesRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4276,7 +4276,7 @@ func (m *ListProcessesResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4304,7 +4304,7 @@ func (m *ListProcessesResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4317,7 +4317,7 @@ func (m *ListProcessesResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -4330,12 +4330,12 @@ func (m *ListProcessesResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4357,7 +4357,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4385,7 +4385,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4399,7 +4399,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -4414,7 +4414,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4428,7 +4428,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { } intStringLen := int(stringLen) if intStringLen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + intStringLen if postIndex > l { @@ -4443,7 +4443,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4456,7 +4456,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -4465,7 +4465,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var keykey uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4480,7 +4480,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var stringLenmapkey uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4494,7 +4494,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { } intStringLenmapkey := int(stringLenmapkey) if intStringLenmapkey < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postStringIndexmapkey := iNdEx + intStringLenmapkey if postStringIndexmapkey > l { @@ -4509,7 +4509,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var valuekey uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4524,7 +4524,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { var stringLenmapvalue uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4538,7 +4538,7 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { } intStringLenmapvalue := int(stringLenmapvalue) if intStringLenmapvalue < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postStringIndexmapvalue := iNdEx + intStringLenmapvalue if postStringIndexmapvalue > l { @@ -4554,12 +4554,12 @@ func (m *CheckpointTaskRequest) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4581,7 +4581,7 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4609,7 +4609,7 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return ErrIntOverflowExecution + return ErrIntOverflowTasks } if iNdEx >= l { return io.ErrUnexpectedEOF @@ -4622,7 +4622,7 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { } } if msglen < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } postIndex := iNdEx + msglen if postIndex > l { @@ -4635,12 +4635,12 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { iNdEx = postIndex default: iNdEx = preIndex - skippy, err := skipExecution(dAtA[iNdEx:]) + skippy, err := skipTasks(dAtA[iNdEx:]) if err != nil { return err } if skippy < 0 { - return ErrInvalidLengthExecution + return ErrInvalidLengthTasks } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF @@ -4654,14 +4654,14 @@ func (m *CheckpointTaskResponse) Unmarshal(dAtA []byte) error { } return nil } -func skipExecution(dAtA []byte) (n int, err error) { +func skipTasks(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowExecution + return 0, ErrIntOverflowTasks } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -4678,7 +4678,7 @@ func skipExecution(dAtA []byte) (n int, err error) { case 0: for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowExecution + return 0, ErrIntOverflowTasks } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -4696,7 +4696,7 @@ func skipExecution(dAtA []byte) (n int, err error) { var length int for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowExecution + return 0, ErrIntOverflowTasks } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -4710,7 +4710,7 @@ func skipExecution(dAtA []byte) (n int, err error) { } iNdEx += length if length < 0 { - return 0, ErrInvalidLengthExecution + return 0, ErrInvalidLengthTasks } return iNdEx, nil case 3: @@ -4719,7 +4719,7 @@ func skipExecution(dAtA []byte) (n int, err error) { var start int = iNdEx for shift := uint(0); ; shift += 7 { if shift >= 64 { - return 0, ErrIntOverflowExecution + return 0, ErrIntOverflowTasks } if iNdEx >= l { return 0, io.ErrUnexpectedEOF @@ -4735,7 +4735,7 @@ func skipExecution(dAtA []byte) (n int, err error) { if innerWireType == 4 { break } - next, err := skipExecution(dAtA[start:]) + next, err := skipTasks(dAtA[start:]) if err != nil { return 0, err } @@ -4755,88 +4755,88 @@ func skipExecution(dAtA []byte) (n int, err error) { } var ( - ErrInvalidLengthExecution = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowExecution = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthTasks = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTasks = fmt.Errorf("proto: integer overflow") ) func init() { - proto.RegisterFile("github.com/containerd/containerd/api/services/execution/execution.proto", fileDescriptorExecution) + proto.RegisterFile("github.com/containerd/containerd/api/services/tasks/tasks.proto", fileDescriptorTasks) } -var fileDescriptorExecution = []byte{ - // 1183 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x4f, 0xe3, 0x46, - 0x14, 0xc7, 0xf9, 0x22, 0xbc, 0x00, 0x0b, 0x53, 0x16, 0x65, 0xdd, 0x55, 0x82, 0x7c, 0x69, 0xba, - 0x2a, 0x4e, 0x09, 0x3d, 0x54, 0xa8, 0x52, 0x17, 0x08, 0x4b, 0xe9, 0x87, 0xa0, 0x66, 0x4f, 0xdb, - 0x4a, 0x91, 0x89, 0x87, 0x30, 0x8a, 0x63, 0x7b, 0x3d, 0x13, 0x96, 0xf4, 0xd4, 0x53, 0xaf, 0xed, - 0x5f, 0xd0, 0x3f, 0xa4, 0xe7, 0x1e, 0x38, 0xf6, 0xd0, 0x43, 0xd5, 0x03, 0xed, 0xd2, 0x7f, 0xa4, - 0x9a, 0xf1, 0xc4, 0x71, 0x3e, 0x9d, 0x6c, 0xb8, 0x24, 0x33, 0xcf, 0xef, 0xbd, 0x79, 0xdf, 0xbf, - 0x07, 0xc7, 0x0d, 0xc2, 0xae, 0xda, 0x17, 0x7a, 0xdd, 0x6d, 0x95, 0xeb, 0xae, 0xc3, 0x4c, 0xe2, - 0x60, 0xdf, 0x8a, 0x1e, 0x4d, 0x8f, 0x94, 0x29, 0xf6, 0xaf, 0x49, 0x1d, 0xd3, 0x32, 0xbe, 0xc1, - 0xf5, 0x36, 0x23, 0xae, 0xd3, 0x3b, 0xe9, 0x9e, 0xef, 0x32, 0x17, 0x3d, 0xed, 0x89, 0xe8, 0x5d, - 0x76, 0x9d, 0x99, 0xb4, 0x49, 0xf5, 0xeb, 0x1d, 0xf5, 0xfd, 0x86, 0xeb, 0x36, 0x6c, 0x5c, 0x16, - 0xbc, 0x17, 0xed, 0xcb, 0x32, 0x6e, 0x79, 0xac, 0x13, 0x88, 0xaa, 0x4f, 0x06, 0x3f, 0x9a, 0x4e, - 0xf7, 0xd3, 0x46, 0xc3, 0x6d, 0xb8, 0xe2, 0x58, 0xe6, 0x27, 0x49, 0xfd, 0x6c, 0x2a, 0xa3, 0x59, - 0xc7, 0xc3, 0xb4, 0xdc, 0x72, 0xdb, 0x0e, 0x0b, 0x7e, 0xa5, 0xf4, 0x8b, 0x19, 0xa4, 0x2d, 0x4c, - 0xeb, 0x3e, 0xf1, 0x98, 0xeb, 0x47, 0x8e, 0x52, 0xcf, 0xde, 0x0c, 0x7a, 0x78, 0x20, 0xc4, 0x8f, - 0x94, 0x2d, 0x0e, 0xba, 0xcc, 0x48, 0x0b, 0x53, 0x66, 0xb6, 0xbc, 0x80, 0x41, 0xfb, 0x35, 0x01, - 0xeb, 0x87, 0x3e, 0x36, 0x19, 0x7e, 0x69, 0xd2, 0xa6, 0x81, 0x5f, 0xb7, 0x31, 0x65, 0xa8, 0x02, - 0xcb, 0xa1, 0xfa, 0x1a, 0xb1, 0xf2, 0x89, 0x2d, 0xa5, 0xb4, 0x74, 0xf0, 0xe8, 0xfe, 0xae, 0x98, - 0x3b, 0xec, 0xd2, 0x4f, 0xaa, 0x46, 0x2e, 0x64, 0x3a, 0xb1, 0x50, 0x05, 0x32, 0xbe, 0xeb, 0xb2, - 0x4b, 0x9a, 0x4f, 0x6e, 0x25, 0x4b, 0xb9, 0x8a, 0xaa, 0x47, 0x32, 0x75, 0xbd, 0xa3, 0x0b, 0x03, - 0xf5, 0x6f, 0x78, 0x80, 0x0c, 0xc9, 0x89, 0x36, 0x20, 0x4d, 0x99, 0x45, 0x9c, 0x7c, 0x8a, 0x3f, - 0x60, 0x04, 0x17, 0xb4, 0x09, 0x19, 0xca, 0x2c, 0xb7, 0xcd, 0xf2, 0x69, 0x41, 0x96, 0x37, 0x49, - 0xc7, 0xbe, 0x9f, 0xcf, 0x84, 0x74, 0xec, 0xfb, 0x48, 0x85, 0x2c, 0xc3, 0x7e, 0x8b, 0x38, 0xa6, - 0x9d, 0x5f, 0xdc, 0x52, 0x4a, 0x59, 0x23, 0xbc, 0xa3, 0xcf, 0x01, 0xea, 0x57, 0xb8, 0xde, 0xf4, - 0x5c, 0xe2, 0xb0, 0x7c, 0x76, 0x4b, 0x29, 0xe5, 0x2a, 0xc5, 0x91, 0x96, 0x55, 0xc3, 0xb8, 0x1b, - 0x11, 0x11, 0xed, 0x15, 0xa0, 0x68, 0x7c, 0xa8, 0xe7, 0x3a, 0x14, 0xbf, 0x53, 0x80, 0xd6, 0x20, - 0xe9, 0x11, 0x2b, 0x9f, 0xdc, 0x52, 0x4a, 0x2b, 0x06, 0x3f, 0x6a, 0x2f, 0x60, 0xed, 0x9c, 0x99, - 0x3e, 0x9b, 0x14, 0x7a, 0x25, 0x5e, 0xb3, 0x76, 0x0c, 0xeb, 0x55, 0x6c, 0xe3, 0xc9, 0x39, 0x9c, - 0x46, 0xd1, 0x6f, 0x0a, 0xac, 0x06, 0x9a, 0xc6, 0x7a, 0xaa, 0x4c, 0xef, 0x69, 0x22, 0xf4, 0x14, - 0x15, 0x21, 0x87, 0x6f, 0x08, 0xab, 0x51, 0x66, 0xb2, 0x36, 0x95, 0x31, 0x00, 0x4e, 0x3a, 0x17, - 0x14, 0xb4, 0x0f, 0x4b, 0xfc, 0x86, 0xad, 0x9a, 0xc9, 0x44, 0x35, 0xf0, 0x02, 0x0a, 0x8a, 0x57, - 0xef, 0x16, 0xaf, 0xfe, 0xb2, 0x5b, 0xbc, 0x07, 0xd9, 0xdb, 0xbb, 0xe2, 0xc2, 0x2f, 0xff, 0x14, - 0x15, 0x23, 0x1b, 0x88, 0xed, 0x33, 0xed, 0x7b, 0xd8, 0x08, 0x6c, 0x3f, 0xf3, 0xdd, 0x3a, 0xa6, - 0x74, 0x8e, 0x40, 0x0c, 0x7b, 0xa0, 0x55, 0x61, 0xf5, 0x18, 0xcf, 0x9d, 0xa9, 0xe7, 0xf0, 0x28, - 0xd4, 0x22, 0x03, 0xbc, 0x0d, 0x29, 0xde, 0xb0, 0x42, 0x3c, 0x57, 0x79, 0x32, 0xb2, 0x36, 0x85, - 0x80, 0x60, 0xd3, 0x9e, 0xc1, 0xda, 0xd7, 0x84, 0x0a, 0x15, 0xa1, 0x87, 0x9b, 0x90, 0xb9, 0x24, - 0x36, 0xc3, 0x7e, 0x60, 0x83, 0x21, 0x6f, 0x5a, 0x15, 0xd6, 0x23, 0xbc, 0xf2, 0xbd, 0x32, 0xa4, - 0xc5, 0xb8, 0xcc, 0x2b, 0xa2, 0x4d, 0x27, 0x3c, 0x18, 0xf0, 0x69, 0x3f, 0x2b, 0x90, 0xfb, 0x8a, - 0xd8, 0xf6, 0x3c, 0xf1, 0xe4, 0xad, 0x4b, 0x1a, 0xbc, 0x41, 0x83, 0x90, 0xca, 0x1b, 0x42, 0x90, - 0x34, 0x6d, 0x5b, 0xd4, 0x43, 0xf6, 0x8b, 0x05, 0x83, 0x5f, 0x38, 0x8d, 0xc7, 0x9e, 0x17, 0xc1, - 0x0a, 0xa7, 0x79, 0xc4, 0x3a, 0x58, 0x06, 0xf0, 0x88, 0x55, 0x73, 0xfd, 0x9a, 0x69, 0xdb, 0xda, - 0x9f, 0x0a, 0xa0, 0xa3, 0x1b, 0x5c, 0x7f, 0x80, 0x44, 0x87, 0x13, 0x28, 0x31, 0x7a, 0x02, 0x25, - 0xc7, 0x4c, 0xa0, 0xd4, 0xd8, 0x09, 0x94, 0x1e, 0x98, 0x40, 0x25, 0x48, 0x51, 0x0f, 0xd7, 0xc5, - 0xcc, 0xca, 0x55, 0x36, 0x86, 0x8a, 0x7a, 0xdf, 0xe9, 0x18, 0x82, 0x43, 0xfb, 0x00, 0xde, 0xeb, - 0xf3, 0x4a, 0x26, 0x4c, 0xd6, 0xa2, 0xd2, 0xab, 0xc5, 0x9f, 0x14, 0x58, 0x33, 0x30, 0x25, 0x3f, - 0xe0, 0x33, 0xd6, 0x79, 0xd0, 0x32, 0xe7, 0xf1, 0x78, 0x43, 0x2c, 0x76, 0x25, 0x5b, 0x34, 0xb8, - 0x70, 0xbf, 0xaf, 0x30, 0x69, 0x5c, 0x05, 0xad, 0xb9, 0x62, 0xc8, 0x9b, 0x66, 0xc3, 0xea, 0xa1, - 0xed, 0x52, 0x7c, 0x72, 0xfa, 0xe0, 0x56, 0x04, 0x59, 0x11, 0x85, 0x21, 0xb3, 0xc2, 0xc7, 0xe5, - 0x99, 0xd9, 0xa6, 0xf8, 0x01, 0xc6, 0xa5, 0x81, 0x69, 0xbb, 0x35, 0xb7, 0xa2, 0x2f, 0x61, 0x83, - 0xf7, 0x97, 0x4c, 0x18, 0x9e, 0xa7, 0x10, 0xb5, 0x73, 0x78, 0x3c, 0xa0, 0x4b, 0xa6, 0x7f, 0x0f, - 0x96, 0xbc, 0x2e, 0x51, 0xf6, 0xec, 0xd3, 0x91, 0x3d, 0xdb, 0xad, 0x9b, 0x1e, 0xbb, 0xf6, 0x7b, - 0x02, 0x1e, 0x1f, 0x86, 0x58, 0x36, 0xa7, 0xbb, 0xa8, 0x06, 0xeb, 0x9e, 0xe9, 0x63, 0x87, 0xd5, - 0x22, 0x90, 0x1a, 0x20, 0x5f, 0x85, 0xcf, 0xe3, 0xbf, 0xef, 0x8a, 0xcf, 0x22, 0xbb, 0x8a, 0xeb, - 0x61, 0x27, 0x14, 0xa7, 0xe5, 0x86, 0xbb, 0x6d, 0x91, 0x06, 0xa6, 0x4c, 0xaf, 0x8a, 0x3f, 0x63, - 0x2d, 0x50, 0xd6, 0xb3, 0x0f, 0xbd, 0x82, 0x45, 0xd7, 0xe3, 0xbb, 0x5e, 0x77, 0x87, 0x78, 0xae, - 0x4f, 0xda, 0xf6, 0xf4, 0x91, 0xae, 0xe9, 0xa7, 0x81, 0x8a, 0x23, 0x87, 0xf9, 0x1d, 0xa3, 0xab, - 0x50, 0xdd, 0x83, 0xe5, 0xe8, 0x07, 0x5e, 0x74, 0x4d, 0xdc, 0x91, 0x03, 0x93, 0x1f, 0x79, 0xd1, - 0x5d, 0x9b, 0x76, 0x1b, 0x77, 0x47, 0x81, 0xb8, 0xec, 0x25, 0x3e, 0x55, 0xb4, 0xef, 0x60, 0x73, - 0xf0, 0x29, 0x99, 0x9c, 0x7d, 0xc8, 0xf5, 0xf6, 0xb5, 0x6e, 0x7a, 0x62, 0xf7, 0x8b, 0xa8, 0x4c, - 0xe5, 0x3f, 0x80, 0xb4, 0x98, 0xd0, 0xa8, 0x09, 0x99, 0x60, 0xd5, 0x40, 0xe5, 0x18, 0xbf, 0x07, - 0x17, 0x36, 0xf5, 0xe3, 0xe9, 0x05, 0xa4, 0xe5, 0xa7, 0x90, 0x16, 0xbb, 0x07, 0xd2, 0x27, 0x8b, - 0x0e, 0x2e, 0x28, 0xea, 0xe6, 0xd0, 0x04, 0x3b, 0xe2, 0x3b, 0x36, 0x6a, 0x40, 0x26, 0x80, 0xdf, - 0x38, 0xeb, 0x87, 0x56, 0x15, 0xf5, 0xa3, 0x69, 0x04, 0x42, 0xcb, 0x5f, 0xc3, 0x4a, 0x1f, 0xce, - 0xa3, 0xca, 0x34, 0xe2, 0xfd, 0x58, 0x31, 0xe3, 0x93, 0x17, 0x90, 0x3c, 0xc6, 0x0c, 0xc5, 0x08, - 0xf5, 0xef, 0x07, 0xea, 0xf6, 0x94, 0xdc, 0xf2, 0x8d, 0x06, 0xa4, 0xf8, 0x00, 0x88, 0xcb, 0xc7, - 0x20, 0xf8, 0xab, 0xe5, 0xa9, 0xf9, 0xe5, 0x43, 0x27, 0x90, 0xe2, 0x70, 0x8e, 0x3e, 0x9c, 0x2c, - 0x18, 0x81, 0xfc, 0xb1, 0x39, 0x6f, 0x42, 0x8a, 0x23, 0x16, 0x8a, 0x29, 0xbf, 0x61, 0xac, 0x56, - 0x77, 0x66, 0x90, 0x90, 0x76, 0x9f, 0xc3, 0x52, 0x08, 0x7a, 0x71, 0x51, 0x1a, 0x44, 0xc7, 0xb1, - 0x1e, 0x9c, 0xc2, 0xa2, 0x44, 0xb0, 0xb8, 0xec, 0xf6, 0x03, 0xdd, 0x04, 0x85, 0x69, 0x01, 0x52, - 0x71, 0x16, 0x0e, 0x22, 0xd9, 0x58, 0x85, 0xdf, 0x42, 0x26, 0x40, 0xab, 0xb8, 0xbe, 0x1a, 0xc2, - 0xb4, 0xb1, 0x2a, 0x6f, 0x60, 0xa5, 0x0f, 0x6b, 0xe2, 0x3a, 0x68, 0x14, 0xc8, 0xa9, 0xbb, 0x33, - 0xc9, 0xc8, 0x1c, 0xbe, 0x01, 0x88, 0xcc, 0xfb, 0xdd, 0x77, 0x18, 0xef, 0xea, 0x27, 0xb3, 0x09, - 0x05, 0x0f, 0x1f, 0xe4, 0x6f, 0xdf, 0x16, 0x16, 0xfe, 0x7a, 0x5b, 0x58, 0xf8, 0xf1, 0xbe, 0xa0, - 0xdc, 0xde, 0x17, 0x94, 0x3f, 0xee, 0x0b, 0xca, 0xbf, 0xf7, 0x05, 0xe5, 0x22, 0x23, 0x82, 0xb3, - 0xfb, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x2e, 0x03, 0x28, 0xa2, 0x10, 0x00, 0x00, +var fileDescriptorTasks = []byte{ + // 1178 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4b, 0x53, 0xe3, 0xc6, + 0x13, 0x47, 0x7e, 0xad, 0x69, 0x2f, 0x2c, 0xcc, 0x9f, 0xa5, 0xbc, 0xfa, 0x6f, 0xd9, 0x94, 0x2e, + 0x71, 0xb6, 0x82, 0x1c, 0x4c, 0x0e, 0x29, 0x2a, 0x55, 0xbb, 0x80, 0x59, 0x42, 0x1e, 0x05, 0x11, + 0x7b, 0xda, 0xa4, 0xca, 0x25, 0xac, 0xc1, 0x4c, 0x59, 0x96, 0xb4, 0x9a, 0x31, 0x8b, 0x73, 0xca, + 0x29, 0xd7, 0xe4, 0x13, 0xe4, 0x83, 0xe4, 0x9c, 0x03, 0xc7, 0x1c, 0x72, 0x48, 0xe5, 0x40, 0xb2, + 0xe4, 0x8b, 0xa4, 0x66, 0x34, 0x12, 0xf2, 0x53, 0xf6, 0x9a, 0x8b, 0x3d, 0xd3, 0xea, 0xee, 0xe9, + 0xf7, 0xaf, 0xe1, 0x79, 0x8b, 0xb0, 0x8b, 0xee, 0x99, 0xde, 0x74, 0x3b, 0xd5, 0xa6, 0xeb, 0x30, + 0x93, 0x38, 0xd8, 0xb7, 0xe2, 0x47, 0xd3, 0x23, 0x55, 0x8a, 0xfd, 0x4b, 0xd2, 0xc4, 0xb4, 0xca, + 0x4c, 0xda, 0x96, 0xbf, 0xba, 0xe7, 0xbb, 0xcc, 0x45, 0x4f, 0xef, 0x58, 0xf5, 0x90, 0x4d, 0x0f, + 0x18, 0x2e, 0xb7, 0xd4, 0xff, 0xb7, 0x5c, 0xb7, 0x65, 0xe3, 0xaa, 0xe0, 0x3d, 0xeb, 0x9e, 0x57, + 0x71, 0xc7, 0x63, 0xbd, 0x40, 0x54, 0x7d, 0x32, 0xf8, 0xd1, 0x74, 0xc2, 0x4f, 0x6b, 0x2d, 0xb7, + 0xe5, 0x8a, 0x63, 0x95, 0x9f, 0x24, 0xf5, 0xb3, 0xa9, 0x8c, 0x65, 0x3d, 0x0f, 0xd3, 0x6a, 0xc7, + 0xed, 0x3a, 0x2c, 0xf8, 0x95, 0xd2, 0x2f, 0x67, 0x90, 0xb6, 0x30, 0x6d, 0xfa, 0xc4, 0x63, 0xae, + 0x1f, 0x3b, 0x4a, 0x3d, 0x3b, 0x33, 0xe8, 0xe1, 0x81, 0x10, 0x3f, 0x52, 0xb6, 0x3c, 0xe8, 0x32, + 0x23, 0x1d, 0x4c, 0x99, 0xd9, 0xf1, 0x02, 0x06, 0xed, 0x97, 0x14, 0xac, 0xee, 0xfb, 0xd8, 0x64, + 0xf8, 0x95, 0x49, 0xdb, 0x06, 0x7e, 0xd3, 0xc5, 0x94, 0xa1, 0x1a, 0x3c, 0x8c, 0xd4, 0x37, 0x88, + 0x55, 0x4c, 0x6d, 0x28, 0x95, 0xc5, 0xbd, 0x47, 0xb7, 0x37, 0xe5, 0xc2, 0x7e, 0x48, 0x3f, 0xaa, + 0x1b, 0x85, 0x88, 0xe9, 0xc8, 0x42, 0x35, 0xc8, 0xf9, 0xae, 0xcb, 0xce, 0x69, 0x31, 0xbd, 0x91, + 0xae, 0x14, 0x6a, 0xaa, 0x1e, 0xcb, 0xd4, 0xe5, 0x96, 0x2e, 0x0c, 0xd4, 0xbf, 0xe6, 0x01, 0x32, + 0x24, 0x27, 0x5a, 0x83, 0x2c, 0x65, 0x16, 0x71, 0x8a, 0x19, 0xfe, 0x80, 0x11, 0x5c, 0xd0, 0x3a, + 0xe4, 0x28, 0xb3, 0xdc, 0x2e, 0x2b, 0x66, 0x05, 0x59, 0xde, 0x24, 0x1d, 0xfb, 0x7e, 0x31, 0x17, + 0xd1, 0xb1, 0xef, 0x23, 0x15, 0xf2, 0x0c, 0xfb, 0x1d, 0xe2, 0x98, 0x76, 0xf1, 0xc1, 0x86, 0x52, + 0xc9, 0x1b, 0xd1, 0x1d, 0x3d, 0x07, 0x68, 0x5e, 0xe0, 0x66, 0xdb, 0x73, 0x89, 0xc3, 0x8a, 0xf9, + 0x0d, 0xa5, 0x52, 0xa8, 0x95, 0x47, 0x5a, 0x56, 0x8f, 0xe2, 0x6e, 0xc4, 0x44, 0xb4, 0xd7, 0x80, + 0xe2, 0xf1, 0xa1, 0x9e, 0xeb, 0x50, 0xfc, 0x5e, 0x01, 0x5a, 0x81, 0xb4, 0x47, 0xac, 0x62, 0x7a, + 0x43, 0xa9, 0x2c, 0x19, 0xfc, 0xa8, 0xbd, 0x84, 0x95, 0x53, 0x66, 0xfa, 0x6c, 0x52, 0xe8, 0x95, + 0x64, 0xcd, 0xda, 0x21, 0xac, 0xd6, 0xb1, 0x8d, 0x27, 0xe7, 0x70, 0x1a, 0x45, 0xbf, 0x2a, 0xb0, + 0x1c, 0x68, 0x1a, 0xeb, 0xa9, 0x32, 0xbd, 0xa7, 0xa9, 0xc8, 0x53, 0x54, 0x86, 0x02, 0xbe, 0x22, + 0xac, 0x41, 0x99, 0xc9, 0xba, 0x54, 0xc6, 0x00, 0x38, 0xe9, 0x54, 0x50, 0xd0, 0x2e, 0x2c, 0xf2, + 0x1b, 0xb6, 0x1a, 0x26, 0x13, 0xd5, 0xc0, 0x0b, 0x28, 0x28, 0x5e, 0x3d, 0x2c, 0x5e, 0xfd, 0x55, + 0x58, 0xbc, 0x7b, 0xf9, 0xeb, 0x9b, 0xf2, 0xc2, 0xcf, 0x7f, 0x97, 0x15, 0x23, 0x1f, 0x88, 0xed, + 0x32, 0xed, 0x3b, 0x58, 0x0b, 0x6c, 0x3f, 0xf1, 0xdd, 0x26, 0xa6, 0x74, 0x8e, 0x40, 0x0c, 0x7b, + 0xa0, 0xd5, 0x61, 0xf9, 0x10, 0xcf, 0x9d, 0xa9, 0x17, 0xf0, 0x28, 0xd2, 0x22, 0x03, 0xbc, 0x09, + 0x19, 0xde, 0xb0, 0x42, 0xbc, 0x50, 0x7b, 0x32, 0xb2, 0x36, 0x85, 0x80, 0x60, 0xd3, 0x9e, 0xc1, + 0xca, 0x57, 0x84, 0x0a, 0x15, 0x91, 0x87, 0xeb, 0x90, 0x3b, 0x27, 0x36, 0xc3, 0x7e, 0x60, 0x83, + 0x21, 0x6f, 0x5a, 0x1d, 0x56, 0x63, 0xbc, 0xf2, 0xbd, 0x2a, 0x64, 0xc5, 0xb8, 0x2c, 0x2a, 0xa2, + 0x4d, 0x27, 0x3c, 0x18, 0xf0, 0x69, 0x3f, 0x29, 0x50, 0xf8, 0x92, 0xd8, 0xf6, 0x3c, 0xf1, 0xe4, + 0xad, 0x4b, 0x5a, 0xbc, 0x41, 0x83, 0x90, 0xca, 0x1b, 0x42, 0x90, 0x36, 0x6d, 0x5b, 0xd4, 0x43, + 0xfe, 0xf3, 0x05, 0x83, 0x5f, 0x38, 0x8d, 0xc7, 0x9e, 0x17, 0xc1, 0x12, 0xa7, 0x79, 0xc4, 0xda, + 0x7b, 0x08, 0xe0, 0x11, 0xab, 0xe1, 0xfa, 0x0d, 0xd3, 0xb6, 0xb5, 0x3f, 0x14, 0x40, 0x07, 0x57, + 0xb8, 0x79, 0x0f, 0x89, 0x8e, 0x26, 0x50, 0x6a, 0xf4, 0x04, 0x4a, 0x8f, 0x99, 0x40, 0x99, 0xb1, + 0x13, 0x28, 0x3b, 0x30, 0x81, 0x2a, 0x90, 0xa1, 0x1e, 0x6e, 0x8a, 0x99, 0x55, 0xa8, 0xad, 0x0d, + 0x15, 0xf5, 0xae, 0xd3, 0x33, 0x04, 0x87, 0xf6, 0x01, 0xfc, 0xaf, 0xcf, 0x2b, 0x99, 0x30, 0x59, + 0x8b, 0xca, 0x5d, 0x2d, 0xfe, 0xa8, 0xc0, 0x8a, 0x81, 0x29, 0xf9, 0x1e, 0x9f, 0xb0, 0xde, 0xbd, + 0x96, 0x39, 0x8f, 0xc7, 0x5b, 0x62, 0xb1, 0x0b, 0xd9, 0xa2, 0xc1, 0x85, 0xfb, 0x7d, 0x81, 0x49, + 0xeb, 0x22, 0x68, 0xcd, 0x25, 0x43, 0xde, 0x34, 0x1b, 0x96, 0xf7, 0x6d, 0x97, 0xe2, 0xa3, 0xe3, + 0x7b, 0xb7, 0x22, 0xc8, 0x8a, 0x28, 0x0c, 0x99, 0x15, 0x3e, 0x2e, 0x4f, 0xcc, 0x2e, 0xc5, 0xf7, + 0x30, 0x2e, 0x0d, 0x4c, 0xbb, 0x9d, 0xb9, 0x15, 0x7d, 0x01, 0x6b, 0xbc, 0xbf, 0x64, 0xc2, 0xf0, + 0x3c, 0x85, 0xa8, 0x9d, 0xc2, 0xe3, 0x01, 0x5d, 0x32, 0xfd, 0x3b, 0xb0, 0xe8, 0x85, 0x44, 0xd9, + 0xb3, 0x4f, 0x47, 0xf6, 0x6c, 0x58, 0x37, 0x77, 0xec, 0xda, 0x6f, 0x29, 0x78, 0xbc, 0x1f, 0x61, + 0xd9, 0x9c, 0xee, 0xa2, 0x06, 0xac, 0x7a, 0xa6, 0x8f, 0x1d, 0xd6, 0x88, 0x41, 0x6a, 0x80, 0x7c, + 0x35, 0x3e, 0x8f, 0xff, 0xba, 0x29, 0x3f, 0x8b, 0xed, 0x2a, 0xae, 0x87, 0x9d, 0x48, 0x9c, 0x56, + 0x5b, 0xee, 0xa6, 0x45, 0x5a, 0x98, 0x32, 0xbd, 0x2e, 0xfe, 0x8c, 0x95, 0x40, 0xd9, 0x9d, 0x7d, + 0xe8, 0x35, 0x3c, 0x70, 0x3d, 0x46, 0x5c, 0x27, 0xdc, 0x21, 0x5e, 0xe8, 0x93, 0xb6, 0x3d, 0x7d, + 0xa4, 0x6b, 0xfa, 0x71, 0xa0, 0xe2, 0xc0, 0x61, 0x7e, 0xcf, 0x08, 0x15, 0xaa, 0x3b, 0xf0, 0x30, + 0xfe, 0x81, 0x17, 0x5d, 0x1b, 0xf7, 0xe4, 0xc0, 0xe4, 0x47, 0x5e, 0x74, 0x97, 0xa6, 0xdd, 0xc5, + 0xe1, 0x28, 0x10, 0x97, 0x9d, 0xd4, 0xa7, 0x8a, 0xf6, 0x2d, 0xac, 0x0f, 0x3e, 0x25, 0x93, 0xb3, + 0x0b, 0x85, 0xbb, 0x7d, 0x2d, 0x4c, 0x4f, 0xe2, 0x7e, 0x11, 0x97, 0xa9, 0xfd, 0x0b, 0x90, 0x15, + 0x13, 0x1a, 0xb5, 0x21, 0x17, 0xac, 0x1a, 0xa8, 0x9a, 0xe0, 0xf7, 0xe0, 0xc2, 0xa6, 0x7e, 0x3c, + 0xbd, 0x80, 0xb4, 0xfc, 0x18, 0xb2, 0x62, 0xf7, 0x40, 0xfa, 0x64, 0xd1, 0xc1, 0x05, 0x45, 0x5d, + 0x1f, 0x9a, 0x60, 0x07, 0x7c, 0xc7, 0x46, 0x2d, 0xc8, 0x05, 0xf0, 0x9b, 0x64, 0xfd, 0xd0, 0xaa, + 0xa2, 0x7e, 0x34, 0x8d, 0x40, 0x64, 0xf9, 0x1b, 0x58, 0xea, 0xc3, 0x79, 0x54, 0x9b, 0x46, 0xbc, + 0x1f, 0x2b, 0x66, 0x7c, 0xf2, 0x0c, 0xd2, 0x87, 0x98, 0xa1, 0x04, 0xa1, 0xfe, 0xfd, 0x40, 0xdd, + 0x9c, 0x92, 0x5b, 0xbe, 0xd1, 0x82, 0x0c, 0x1f, 0x00, 0x49, 0xf9, 0x18, 0x04, 0x7f, 0xb5, 0x3a, + 0x35, 0xbf, 0x7c, 0xe8, 0x08, 0x32, 0x1c, 0xce, 0xd1, 0x87, 0x93, 0x05, 0x63, 0x90, 0x3f, 0x36, + 0xe7, 0x6d, 0xc8, 0x70, 0xc4, 0x42, 0x09, 0xe5, 0x37, 0x8c, 0xd5, 0xea, 0xd6, 0x0c, 0x12, 0xd2, + 0xee, 0x53, 0x58, 0x8c, 0x40, 0x2f, 0x29, 0x4a, 0x83, 0xe8, 0x38, 0xd6, 0x83, 0x63, 0x78, 0x20, + 0x11, 0x2c, 0x29, 0xbb, 0xfd, 0x40, 0x37, 0x41, 0x61, 0x56, 0x80, 0x54, 0x92, 0x85, 0x83, 0x48, + 0x36, 0x56, 0xe1, 0x37, 0x90, 0x0b, 0xd0, 0x2a, 0xa9, 0xaf, 0x86, 0x30, 0x6d, 0xac, 0xca, 0x2b, + 0x58, 0xea, 0xc3, 0x9a, 0xa4, 0x0e, 0x1a, 0x05, 0x72, 0xea, 0xf6, 0x4c, 0x32, 0x32, 0x87, 0x6f, + 0x01, 0x62, 0xf3, 0x7e, 0xfb, 0x3d, 0xc6, 0xbb, 0xfa, 0xc9, 0x6c, 0x42, 0xc1, 0xc3, 0x7b, 0xc5, + 0xeb, 0x77, 0xa5, 0x85, 0x3f, 0xdf, 0x95, 0x16, 0x7e, 0xb8, 0x2d, 0x29, 0xd7, 0xb7, 0x25, 0xe5, + 0xf7, 0xdb, 0x92, 0xf2, 0xcf, 0x6d, 0x49, 0x39, 0xcb, 0x89, 0xe0, 0x6c, 0xff, 0x17, 0x00, 0x00, + 0xff, 0xff, 0xb0, 0x5b, 0xd4, 0x42, 0x9a, 0x10, 0x00, 0x00, } diff --git a/api/services/execution/execution.proto b/api/services/tasks/tasks.proto similarity index 100% rename from api/services/execution/execution.proto rename to api/services/tasks/tasks.proto diff --git a/client.go b/client.go index e1b46510a..1a32cbebc 100644 --- a/client.go +++ b/client.go @@ -14,10 +14,10 @@ import ( contentapi "github.com/containerd/containerd/api/services/content" diffapi "github.com/containerd/containerd/api/services/diff" eventsapi "github.com/containerd/containerd/api/services/events" - "github.com/containerd/containerd/api/services/execution" imagesapi "github.com/containerd/containerd/api/services/images" namespacesapi "github.com/containerd/containerd/api/services/namespaces" snapshotapi "github.com/containerd/containerd/api/services/snapshot" + "github.com/containerd/containerd/api/services/tasks" versionservice "github.com/containerd/containerd/api/services/version" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" @@ -456,8 +456,8 @@ func (c *Client) SnapshotService() snapshot.Snapshotter { return snapshotservice.NewSnapshotterFromClient(snapshotapi.NewSnapshotsClient(c.conn)) } -func (c *Client) TaskService() execution.TasksClient { - return execution.NewTasksClient(c.conn) +func (c *Client) TaskService() tasks.TasksClient { + return tasks.NewTasksClient(c.conn) } func (c *Client) ImageService() images.Store { diff --git a/cmd/containerd/builtins.go b/cmd/containerd/builtins.go index bbfc82a5d..75ea0b007 100644 --- a/cmd/containerd/builtins.go +++ b/cmd/containerd/builtins.go @@ -7,10 +7,10 @@ import ( _ "github.com/containerd/containerd/services/content" _ "github.com/containerd/containerd/services/diff" _ "github.com/containerd/containerd/services/events" - _ "github.com/containerd/containerd/services/execution" _ "github.com/containerd/containerd/services/healthcheck" _ "github.com/containerd/containerd/services/images" _ "github.com/containerd/containerd/services/namespaces" _ "github.com/containerd/containerd/services/snapshot" + _ "github.com/containerd/containerd/services/tasks" _ "github.com/containerd/containerd/services/version" ) diff --git a/cmd/containerd/main.go b/cmd/containerd/main.go index 174a1d226..f0dd428b0 100644 --- a/cmd/containerd/main.go +++ b/cmd/containerd/main.go @@ -21,10 +21,10 @@ import ( containersapi "github.com/containerd/containerd/api/services/containers" contentapi "github.com/containerd/containerd/api/services/content" diffapi "github.com/containerd/containerd/api/services/diff" - api "github.com/containerd/containerd/api/services/execution" imagesapi "github.com/containerd/containerd/api/services/images" namespacesapi "github.com/containerd/containerd/api/services/namespaces" snapshotapi "github.com/containerd/containerd/api/services/snapshot" + api "github.com/containerd/containerd/api/services/tasks" versionapi "github.com/containerd/containerd/api/services/version" "github.com/containerd/containerd/content" "github.com/containerd/containerd/events" diff --git a/cmd/ctr/run_windows.go b/cmd/ctr/run_windows.go index 259b3bccd..86b20b2a3 100644 --- a/cmd/ctr/run_windows.go +++ b/cmd/ctr/run_windows.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/console" "github.com/containerd/containerd" containersapi "github.com/containerd/containerd/api/services/containers" - "github.com/containerd/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/log" "github.com/containerd/containerd/mount" "github.com/containerd/containerd/windows" @@ -160,8 +160,8 @@ func newCreateContainerRequest(context *cli.Context, id, snapshot, image string, return create, nil } -func newCreateTaskRequest(context *cli.Context, id, tmpDir string, checkpoint *ocispec.Descriptor, mounts []mount.Mount) (*execution.CreateTaskRequest, error) { - create := &execution.CreateTaskRequest{ +func newCreateTaskRequest(context *cli.Context, id, tmpDir string, checkpoint *ocispec.Descriptor, mounts []mount.Mount) (*tasks.CreateTaskRequest, error) { + create := &tasks.CreateTaskRequest{ ContainerID: id, Terminal: context.Bool("tty"), Stdin: fmt.Sprintf(`%s\ctr-%s-stdin`, pipeRoot, id), diff --git a/cmd/ctr/utils.go b/cmd/ctr/utils.go index 293339182..109a917e2 100644 --- a/cmd/ctr/utils.go +++ b/cmd/ctr/utils.go @@ -16,10 +16,10 @@ import ( contentapi "github.com/containerd/containerd/api/services/content" diffapi "github.com/containerd/containerd/api/services/diff" "github.com/containerd/containerd/api/services/events" - "github.com/containerd/containerd/api/services/execution" imagesapi "github.com/containerd/containerd/api/services/images" namespacesapi "github.com/containerd/containerd/api/services/namespaces" snapshotapi "github.com/containerd/containerd/api/services/snapshot" + "github.com/containerd/containerd/api/services/tasks" versionservice "github.com/containerd/containerd/api/services/version" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" @@ -81,12 +81,12 @@ func getContainersService(context *cli.Context) (containersapi.ContainersClient, return containersapi.NewContainersClient(conn), nil } -func getTasksService(context *cli.Context) (execution.TasksClient, error) { +func getTasksService(context *cli.Context) (tasks.TasksClient, error) { conn, err := getGRPCConnection(context) if err != nil { return nil, err } - return execution.NewTasksClient(conn), nil + return tasks.NewTasksClient(conn), nil } func getEventsService(context *cli.Context) (events.EventsClient, error) { diff --git a/container.go b/container.go index ded6ebd36..bd8411827 100644 --- a/container.go +++ b/container.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "github.com/containerd/containerd/api/services/containers" - "github.com/containerd/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/types/mount" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" @@ -104,7 +104,7 @@ func (c *container) Image(ctx context.Context) (Image, error) { }, nil } -type NewTaskOpts func(context.Context, *Client, *execution.CreateTaskRequest) error +type NewTaskOpts func(context.Context, *Client, *tasks.CreateTaskRequest) error func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...NewTaskOpts) (Task, error) { c.mu.Lock() @@ -113,7 +113,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne if err != nil { return nil, err } - request := &execution.CreateTaskRequest{ + request := &tasks.CreateTaskRequest{ ContainerID: c.c.ID, Terminal: i.Terminal, Stdin: i.Stdin, @@ -161,7 +161,7 @@ func (c *container) NewTask(ctx context.Context, ioCreate IOCreation, opts ...Ne } func (c *container) loadTask(ctx context.Context, ioAttach IOAttach) (Task, error) { - response, err := c.client.TaskService().Get(ctx, &execution.GetTaskRequest{ + response, err := c.client.TaskService().Get(ctx, &tasks.GetTaskRequest{ ContainerID: c.c.ID, }) if err != nil { diff --git a/container_unix.go b/container_unix.go index 181ccc36c..99f2520d9 100644 --- a/container_unix.go +++ b/container_unix.go @@ -9,7 +9,7 @@ import ( "io/ioutil" "github.com/containerd/containerd/api/services/containers" - "github.com/containerd/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/content" "github.com/containerd/containerd/images" @@ -83,7 +83,7 @@ func WithCheckpoint(desc v1.Descriptor, rootfsID string) NewContainerOpts { } func WithTaskCheckpoint(desc v1.Descriptor) NewTaskOpts { - return func(ctx context.Context, c *Client, r *execution.CreateTaskRequest) error { + return func(ctx context.Context, c *Client, r *tasks.CreateTaskRequest) error { id := desc.Digest index, err := decodeIndex(ctx, c.ContentStore(), id) if err != nil { diff --git a/plugin/container.go b/plugin/task.go similarity index 100% rename from plugin/container.go rename to plugin/task.go diff --git a/process.go b/process.go index 3778c130d..f0e34acb3 100644 --- a/process.go +++ b/process.go @@ -6,7 +6,7 @@ import ( "syscall" eventsapi "github.com/containerd/containerd/api/services/events" - "github.com/containerd/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/types/event" tasktypes "github.com/containerd/containerd/api/types/task" "github.com/gogo/protobuf/proto" @@ -41,7 +41,7 @@ func (p *process) Start(ctx context.Context) error { if err != nil { return err } - request := &execution.ExecProcessRequest{ + request := &tasks.ExecProcessRequest{ ContainerID: p.task.containerID, Terminal: p.io.Terminal, Stdin: p.io.Stdin, @@ -62,10 +62,10 @@ func (p *process) Start(ctx context.Context) error { } func (p *process) Kill(ctx context.Context, s syscall.Signal) error { - _, err := p.task.client.TaskService().Kill(ctx, &execution.KillRequest{ + _, err := p.task.client.TaskService().Kill(ctx, &tasks.KillRequest{ Signal: uint32(s), ContainerID: p.task.containerID, - PidOrAll: &execution.KillRequest_Pid{ + PidOrAll: &tasks.KillRequest_Pid{ Pid: p.pid, }, }) @@ -102,7 +102,7 @@ func (p *process) Wait(ctx context.Context) (uint32, error) { } func (p *process) CloseIO(ctx context.Context, opts ...IOCloserOpts) error { - r := &execution.CloseIORequest{ + r := &tasks.CloseIORequest{ ContainerID: p.task.containerID, Pid: p.pid, } @@ -118,7 +118,7 @@ func (p *process) IO() *IO { } func (p *process) Resize(ctx context.Context, w, h uint32) error { - _, err := p.task.client.TaskService().ResizePty(ctx, &execution.ResizePtyRequest{ + _, err := p.task.client.TaskService().ResizePty(ctx, &tasks.ResizePtyRequest{ ContainerID: p.task.containerID, Width: w, Height: h, @@ -129,7 +129,7 @@ func (p *process) Resize(ctx context.Context, w, h uint32) error { func (p *process) Delete(ctx context.Context) (uint32, error) { cerr := p.io.Close() - r, err := p.task.client.TaskService().DeleteProcess(ctx, &execution.DeleteProcessRequest{ + r, err := p.task.client.TaskService().DeleteProcess(ctx, &tasks.DeleteProcessRequest{ ContainerID: p.task.containerID, Pid: p.pid, }) diff --git a/services/execution/service.go b/services/tasks/service.go similarity index 99% rename from services/execution/service.go rename to services/tasks/service.go index e07bc274c..e368c55e4 100644 --- a/services/execution/service.go +++ b/services/tasks/service.go @@ -1,4 +1,4 @@ -package execution +package tasks import ( "bytes" @@ -9,7 +9,7 @@ import ( "path/filepath" "github.com/boltdb/bolt" - api "github.com/containerd/containerd/api/services/execution" + api "github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/task" diff --git a/task.go b/task.go index 5c89ea249..8b2875a64 100644 --- a/task.go +++ b/task.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/containerd/api/services/containers" eventsapi "github.com/containerd/containerd/api/services/events" - "github.com/containerd/containerd/api/services/execution" + "github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/types/event" tasktypes "github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/content" @@ -34,13 +34,13 @@ const ( Pausing TaskStatus = "pausing" ) -type IOCloserOpts func(*execution.CloseIORequest) +type IOCloserOpts func(*tasks.CloseIORequest) -func WithStdinCloser(r *execution.CloseIORequest) { +func WithStdinCloser(r *tasks.CloseIORequest) { r.Stdin = true } -type CheckpointOpts func(*execution.CheckpointTaskRequest) error +type CheckpointOpts func(*tasks.CheckpointTaskRequest) error type Task interface { Pid() uint32 @@ -79,7 +79,7 @@ type task struct { containerID string pid uint32 - deferred *execution.CreateTaskRequest + deferred *tasks.CreateTaskRequest pidSync chan struct{} } @@ -99,17 +99,17 @@ func (t *task) Start(ctx context.Context) error { close(t.pidSync) return nil } - _, err := t.client.TaskService().Start(ctx, &execution.StartTaskRequest{ + _, err := t.client.TaskService().Start(ctx, &tasks.StartTaskRequest{ ContainerID: t.containerID, }) return err } func (t *task) Kill(ctx context.Context, s syscall.Signal) error { - _, err := t.client.TaskService().Kill(ctx, &execution.KillRequest{ + _, err := t.client.TaskService().Kill(ctx, &tasks.KillRequest{ Signal: uint32(s), ContainerID: t.containerID, - PidOrAll: &execution.KillRequest_All{ + PidOrAll: &tasks.KillRequest_All{ All: true, }, }) @@ -117,21 +117,21 @@ func (t *task) Kill(ctx context.Context, s syscall.Signal) error { } func (t *task) Pause(ctx context.Context) error { - _, err := t.client.TaskService().Pause(ctx, &execution.PauseTaskRequest{ + _, err := t.client.TaskService().Pause(ctx, &tasks.PauseTaskRequest{ ContainerID: t.containerID, }) return err } func (t *task) Resume(ctx context.Context) error { - _, err := t.client.TaskService().Resume(ctx, &execution.ResumeTaskRequest{ + _, err := t.client.TaskService().Resume(ctx, &tasks.ResumeTaskRequest{ ContainerID: t.containerID, }) return err } func (t *task) Status(ctx context.Context) (TaskStatus, error) { - r, err := t.client.TaskService().Get(ctx, &execution.GetTaskRequest{ + r, err := t.client.TaskService().Get(ctx, &tasks.GetTaskRequest{ ContainerID: t.containerID, }) if err != nil { @@ -178,7 +178,7 @@ func (t *task) Delete(ctx context.Context) (uint32, error) { if t.io != nil { cerr = t.io.Close() } - r, err := t.client.TaskService().Delete(ctx, &execution.DeleteTaskRequest{ + r, err := t.client.TaskService().Delete(ctx, &tasks.DeleteTaskRequest{ ContainerID: t.containerID, }) if err != nil { @@ -201,7 +201,7 @@ func (t *task) Exec(ctx context.Context, spec *specs.Process, ioCreate IOCreatio } func (t *task) Processes(ctx context.Context) ([]uint32, error) { - response, err := t.client.TaskService().ListProcesses(ctx, &execution.ListProcessesRequest{ + response, err := t.client.TaskService().ListProcesses(ctx, &tasks.ListProcessesRequest{ ContainerID: t.containerID, }) if err != nil { @@ -215,7 +215,7 @@ func (t *task) Processes(ctx context.Context) ([]uint32, error) { } func (t *task) CloseIO(ctx context.Context, opts ...IOCloserOpts) error { - r := &execution.CloseIORequest{ + r := &tasks.CloseIORequest{ ContainerID: t.containerID, Pid: t.pid, } @@ -231,7 +231,7 @@ func (t *task) IO() *IO { } func (t *task) Resize(ctx context.Context, w, h uint32) error { - _, err := t.client.TaskService().ResizePty(ctx, &execution.ResizePtyRequest{ + _, err := t.client.TaskService().ResizePty(ctx, &tasks.ResizePtyRequest{ ContainerID: t.containerID, Width: w, Height: h, @@ -240,13 +240,13 @@ func (t *task) Resize(ctx context.Context, w, h uint32) error { return err } -func WithExit(r *execution.CheckpointTaskRequest) error { +func WithExit(r *tasks.CheckpointTaskRequest) error { r.Options["exit"] = "true" return nil } func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointOpts) (d v1.Descriptor, err error) { - request := &execution.CheckpointTaskRequest{ + request := &tasks.CheckpointTaskRequest{ ContainerID: t.containerID, Options: make(map[string]string), } @@ -281,7 +281,7 @@ func (t *task) Checkpoint(ctx context.Context, opts ...CheckpointOpts) (d v1.Des return t.writeIndex(ctx, &index) } -func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *execution.CheckpointTaskRequest) error { +func (t *task) checkpointTask(ctx context.Context, index *v1.Index, request *tasks.CheckpointTaskRequest) error { response, err := t.client.TaskService().Checkpoint(ctx, request) if err != nil { return err