diff --git a/api/next.pb.txt b/api/next.pb.txt index 6208b6b3c..43cbe6c82 100644 --- a/api/next.pb.txt +++ b/api/next.pb.txt @@ -3306,45 +3306,6 @@ file { json_name: "exitedAt" } } - message_type { - name: "ControllerPauseRequest" - field { - name: "sandbox_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "sandboxId" - } - } - message_type { - name: "ControllerPauseResponse" - } - message_type { - name: "ControllerResumeRequest" - field { - name: "sandbox_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "sandboxId" - } - } - message_type { - name: "ControllerResumeResponse" - } - message_type { - name: "ControllerPingRequest" - field { - name: "sandbox_id" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_STRING - json_name: "sandboxId" - } - } - message_type { - name: "ControllerPingResponse" - } message_type { name: "ControllerStatusRequest" field { @@ -3451,21 +3412,6 @@ file { input_type: ".containerd.services.sandbox.v1.ControllerWaitRequest" output_type: ".containerd.services.sandbox.v1.ControllerWaitResponse" } - method { - name: "Pause" - input_type: ".containerd.services.sandbox.v1.ControllerPauseRequest" - output_type: ".containerd.services.sandbox.v1.ControllerPauseResponse" - } - method { - name: "Resume" - input_type: ".containerd.services.sandbox.v1.ControllerResumeRequest" - output_type: ".containerd.services.sandbox.v1.ControllerResumeResponse" - } - method { - name: "Ping" - input_type: ".containerd.services.sandbox.v1.ControllerPingRequest" - output_type: ".containerd.services.sandbox.v1.ControllerPingResponse" - } method { name: "Status" input_type: ".containerd.services.sandbox.v1.ControllerStatusRequest" diff --git a/api/services/sandbox/v1/sandbox.pb.go b/api/services/sandbox/v1/sandbox.pb.go index 3e8480481..94403a005 100644 --- a/api/services/sandbox/v1/sandbox.pb.go +++ b/api/services/sandbox/v1/sandbox.pb.go @@ -669,237 +669,6 @@ func (m *ControllerWaitResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ControllerWaitResponse proto.InternalMessageInfo -type ControllerPauseRequest struct { - SandboxID string `protobuf:"bytes,1,opt,name=sandbox_id,json=sandboxId,proto3" json:"sandbox_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ControllerPauseRequest) Reset() { *m = ControllerPauseRequest{} } -func (*ControllerPauseRequest) ProtoMessage() {} -func (*ControllerPauseRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{16} -} -func (m *ControllerPauseRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ControllerPauseRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ControllerPauseRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ControllerPauseRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ControllerPauseRequest.Merge(m, src) -} -func (m *ControllerPauseRequest) XXX_Size() int { - return m.Size() -} -func (m *ControllerPauseRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ControllerPauseRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ControllerPauseRequest proto.InternalMessageInfo - -type ControllerPauseResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ControllerPauseResponse) Reset() { *m = ControllerPauseResponse{} } -func (*ControllerPauseResponse) ProtoMessage() {} -func (*ControllerPauseResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{17} -} -func (m *ControllerPauseResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ControllerPauseResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ControllerPauseResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ControllerPauseResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ControllerPauseResponse.Merge(m, src) -} -func (m *ControllerPauseResponse) XXX_Size() int { - return m.Size() -} -func (m *ControllerPauseResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ControllerPauseResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ControllerPauseResponse proto.InternalMessageInfo - -type ControllerResumeRequest struct { - SandboxID string `protobuf:"bytes,1,opt,name=sandbox_id,json=sandboxId,proto3" json:"sandbox_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ControllerResumeRequest) Reset() { *m = ControllerResumeRequest{} } -func (*ControllerResumeRequest) ProtoMessage() {} -func (*ControllerResumeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{18} -} -func (m *ControllerResumeRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ControllerResumeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ControllerResumeRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ControllerResumeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ControllerResumeRequest.Merge(m, src) -} -func (m *ControllerResumeRequest) XXX_Size() int { - return m.Size() -} -func (m *ControllerResumeRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ControllerResumeRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ControllerResumeRequest proto.InternalMessageInfo - -type ControllerResumeResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ControllerResumeResponse) Reset() { *m = ControllerResumeResponse{} } -func (*ControllerResumeResponse) ProtoMessage() {} -func (*ControllerResumeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{19} -} -func (m *ControllerResumeResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ControllerResumeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ControllerResumeResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ControllerResumeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ControllerResumeResponse.Merge(m, src) -} -func (m *ControllerResumeResponse) XXX_Size() int { - return m.Size() -} -func (m *ControllerResumeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ControllerResumeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ControllerResumeResponse proto.InternalMessageInfo - -type ControllerPingRequest struct { - SandboxID string `protobuf:"bytes,1,opt,name=sandbox_id,json=sandboxId,proto3" json:"sandbox_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ControllerPingRequest) Reset() { *m = ControllerPingRequest{} } -func (*ControllerPingRequest) ProtoMessage() {} -func (*ControllerPingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{20} -} -func (m *ControllerPingRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ControllerPingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ControllerPingRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ControllerPingRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ControllerPingRequest.Merge(m, src) -} -func (m *ControllerPingRequest) XXX_Size() int { - return m.Size() -} -func (m *ControllerPingRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ControllerPingRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ControllerPingRequest proto.InternalMessageInfo - -type ControllerPingResponse struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ControllerPingResponse) Reset() { *m = ControllerPingResponse{} } -func (*ControllerPingResponse) ProtoMessage() {} -func (*ControllerPingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{21} -} -func (m *ControllerPingResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ControllerPingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ControllerPingResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ControllerPingResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ControllerPingResponse.Merge(m, src) -} -func (m *ControllerPingResponse) XXX_Size() int { - return m.Size() -} -func (m *ControllerPingResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ControllerPingResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ControllerPingResponse proto.InternalMessageInfo - type ControllerStatusRequest struct { SandboxID string `protobuf:"bytes,1,opt,name=sandbox_id,json=sandboxId,proto3" json:"sandbox_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -910,7 +679,7 @@ type ControllerStatusRequest struct { func (m *ControllerStatusRequest) Reset() { *m = ControllerStatusRequest{} } func (*ControllerStatusRequest) ProtoMessage() {} func (*ControllerStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{22} + return fileDescriptor_d6eb1ebcbc2879f1, []int{16} } func (m *ControllerStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -954,7 +723,7 @@ type ControllerStatusResponse struct { func (m *ControllerStatusResponse) Reset() { *m = ControllerStatusResponse{} } func (*ControllerStatusResponse) ProtoMessage() {} func (*ControllerStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d6eb1ebcbc2879f1, []int{23} + return fileDescriptor_d6eb1ebcbc2879f1, []int{17} } func (m *ControllerStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1000,12 +769,6 @@ func init() { proto.RegisterType((*ControllerShutdownResponse)(nil), "containerd.services.sandbox.v1.ControllerShutdownResponse") proto.RegisterType((*ControllerWaitRequest)(nil), "containerd.services.sandbox.v1.ControllerWaitRequest") proto.RegisterType((*ControllerWaitResponse)(nil), "containerd.services.sandbox.v1.ControllerWaitResponse") - proto.RegisterType((*ControllerPauseRequest)(nil), "containerd.services.sandbox.v1.ControllerPauseRequest") - proto.RegisterType((*ControllerPauseResponse)(nil), "containerd.services.sandbox.v1.ControllerPauseResponse") - proto.RegisterType((*ControllerResumeRequest)(nil), "containerd.services.sandbox.v1.ControllerResumeRequest") - proto.RegisterType((*ControllerResumeResponse)(nil), "containerd.services.sandbox.v1.ControllerResumeResponse") - proto.RegisterType((*ControllerPingRequest)(nil), "containerd.services.sandbox.v1.ControllerPingRequest") - proto.RegisterType((*ControllerPingResponse)(nil), "containerd.services.sandbox.v1.ControllerPingResponse") proto.RegisterType((*ControllerStatusRequest)(nil), "containerd.services.sandbox.v1.ControllerStatusRequest") proto.RegisterType((*ControllerStatusResponse)(nil), "containerd.services.sandbox.v1.ControllerStatusResponse") } @@ -1015,67 +778,61 @@ func init() { } var fileDescriptor_d6eb1ebcbc2879f1 = []byte{ - // 946 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xae, 0xd3, 0xc4, 0x6d, 0x5e, 0xa8, 0x58, 0x86, 0x6e, 0xd7, 0xb5, 0x50, 0x52, 0x7c, 0xaa, - 0xd0, 0xca, 0xde, 0xa6, 0xa2, 0xec, 0xc2, 0x01, 0x9a, 0x2d, 0x5b, 0x2a, 0x81, 0xa8, 0x1c, 0x10, - 0xb0, 0x97, 0xca, 0x8d, 0xa7, 0xa9, 0x45, 0xe2, 0x71, 0x3c, 0xe3, 0x92, 0x0a, 0x0e, 0xf0, 0x0f, - 0xf8, 0x17, 0xfc, 0x04, 0xfe, 0x42, 0x8f, 0x1c, 0x39, 0x15, 0x36, 0x47, 0xc4, 0x8f, 0x40, 0x9e, - 0x19, 0xd7, 0x76, 0x13, 0x15, 0xdb, 0xdd, 0xdb, 0xcc, 0xf8, 0xbd, 0xef, 0x7d, 0xef, 0xcd, 0x9b, - 0xf7, 0x25, 0xf0, 0x62, 0xe8, 0xb1, 0xf3, 0xe8, 0xd4, 0x1c, 0x90, 0xb1, 0x35, 0x20, 0x3e, 0x73, - 0x3c, 0x1f, 0x87, 0x6e, 0x76, 0xe9, 0x04, 0x9e, 0x45, 0x71, 0x78, 0xe1, 0x0d, 0x30, 0xb5, 0xa8, - 0xe3, 0xbb, 0xa7, 0x64, 0x6a, 0x5d, 0xec, 0x24, 0x4b, 0x33, 0x08, 0x09, 0x23, 0xa8, 0x9d, 0x7a, - 0x98, 0x89, 0xb5, 0x99, 0x98, 0x5c, 0xec, 0xe8, 0x9b, 0x43, 0x42, 0x86, 0x23, 0x6c, 0x71, 0xeb, - 0xd3, 0xe8, 0xcc, 0x72, 0xfc, 0x4b, 0xe1, 0xaa, 0x77, 0x6e, 0x7f, 0x62, 0xde, 0x18, 0x53, 0xe6, - 0x8c, 0x03, 0x69, 0xb0, 0x3e, 0x24, 0x43, 0xc2, 0x97, 0x56, 0xbc, 0x92, 0xa7, 0x4f, 0x0b, 0x31, - 0x67, 0x97, 0x41, 0x4a, 0x5b, 0x7a, 0xee, 0x95, 0xf0, 0x1c, 0x93, 0xc8, 0x67, 0xc2, 0xcf, 0xf8, - 0x12, 0x50, 0x9f, 0x91, 0x10, 0x3f, 0x0f, 0xb1, 0xc3, 0xb0, 0x8d, 0x27, 0x11, 0xa6, 0x0c, 0x3d, - 0x83, 0x15, 0x09, 0xaf, 0x29, 0x5b, 0xca, 0x76, 0xab, 0xbb, 0x69, 0x66, 0x6a, 0xc1, 0x51, 0xcc, - 0xbe, 0x30, 0xe8, 0xd5, 0xaf, 0xae, 0x3b, 0x4b, 0x76, 0x62, 0x6f, 0x1c, 0xc3, 0xdb, 0x39, 0x40, - 0x1a, 0x10, 0x9f, 0xe2, 0xfb, 0x20, 0x0e, 0x25, 0xc5, 0xaf, 0x03, 0xf7, 0xb5, 0x50, 0x44, 0x1b, - 0xa0, 0x9e, 0x79, 0x78, 0xe4, 0x52, 0xad, 0xb6, 0xb5, 0xbc, 0xdd, 0xb4, 0xe5, 0xee, 0x86, 0x7a, - 0x12, 0xe8, 0xfe, 0xd4, 0x7b, 0x92, 0xfa, 0x01, 0x1e, 0xe1, 0x94, 0xfa, 0x63, 0x00, 0x69, 0x70, - 0xe2, 0xb9, 0x1c, 0xb3, 0xd9, 0x5b, 0x9b, 0x5d, 0x77, 0x9a, 0x12, 0xe5, 0xe8, 0xc0, 0x6e, 0x4a, - 0x83, 0x23, 0xd7, 0x78, 0x28, 0x59, 0x25, 0x18, 0x82, 0x95, 0xf1, 0x18, 0x1e, 0xf0, 0xe3, 0xcf, - 0x3d, 0xca, 0x12, 0x60, 0x0d, 0x56, 0xce, 0xbc, 0x11, 0xc3, 0x21, 0xd5, 0x14, 0x9e, 0x59, 0xb2, - 0x35, 0x3e, 0x83, 0xb7, 0x32, 0xd6, 0x32, 0xb1, 0x5d, 0xa8, 0x8f, 0x3c, 0xca, 0xb8, 0x6d, 0x81, - 0xac, 0xb8, 0xb1, 0xf1, 0x31, 0xbc, 0xc9, 0x91, 0x0e, 0x31, 0xab, 0x96, 0xcf, 0xa1, 0x24, 0xce, - 0x01, 0x6e, 0x98, 0x14, 0x2e, 0x71, 0x5a, 0xdc, 0xdf, 0x14, 0xd8, 0x78, 0x4e, 0x7c, 0x16, 0x92, - 0xd1, 0x08, 0x87, 0x7d, 0xe6, 0x84, 0xd5, 0x18, 0x21, 0x0b, 0xd4, 0x90, 0x10, 0x76, 0x26, 0xfa, - 0xa1, 0xd5, 0x7d, 0x34, 0x1f, 0xfc, 0x8b, 0xf8, 0xc9, 0xd8, 0xd2, 0x0c, 0x99, 0xb0, 0x42, 0x02, - 0xe6, 0x11, 0x9f, 0x6a, 0xcb, 0x9c, 0xee, 0xba, 0x29, 0xde, 0xbb, 0x99, 0xbc, 0x77, 0x73, 0xdf, - 0xbf, 0xb4, 0x13, 0x23, 0xe3, 0x3b, 0x78, 0x34, 0x47, 0x54, 0x66, 0x5e, 0x8e, 0xe9, 0x03, 0x58, - 0x0e, 0x3c, 0x57, 0xab, 0x6d, 0x29, 0xdb, 0x6b, 0x76, 0xbc, 0x34, 0x46, 0xb0, 0x99, 0x81, 0x3e, - 0x8f, 0x98, 0x4b, 0x7e, 0xf0, 0xab, 0x95, 0xe1, 0x5d, 0x78, 0x23, 0x9e, 0x52, 0x24, 0x62, 0x27, - 0x14, 0x0f, 0xa8, 0x8c, 0xd2, 0x92, 0x67, 0x7d, 0x3c, 0xa0, 0xc6, 0x3b, 0xa0, 0x2f, 0x8a, 0x26, - 0x5b, 0xf2, 0x53, 0x78, 0x98, 0x7e, 0xfd, 0xc6, 0xf1, 0x2a, 0x36, 0xc8, 0x4f, 0xd9, 0x6b, 0x15, - 0x30, 0xb2, 0x58, 0x1d, 0x68, 0xe1, 0xa9, 0xc7, 0x4e, 0x28, 0x73, 0x58, 0x44, 0x39, 0xd0, 0x9a, - 0x0d, 0xf1, 0x51, 0x9f, 0x9f, 0xa0, 0x7d, 0x68, 0xc6, 0x3b, 0xec, 0x9e, 0x38, 0x8c, 0xf3, 0x6f, - 0x75, 0xf5, 0xb9, 0xab, 0xf9, 0x2a, 0x19, 0xc5, 0xbd, 0xd5, 0xb8, 0xaf, 0x7f, 0xfd, 0xab, 0xa3, - 0xd8, 0xab, 0xc2, 0x6d, 0x9f, 0x19, 0x2f, 0xb2, 0xd1, 0x8f, 0x9d, 0x88, 0x56, 0x7c, 0xb6, 0x9b, - 0xd9, 0x3b, 0x97, 0x38, 0xb2, 0x4e, 0x87, 0xd9, 0x4f, 0x36, 0xa6, 0xd1, 0xb8, 0x62, 0x0c, 0x1d, - 0xb4, 0x79, 0xa0, 0x45, 0x97, 0x71, 0xec, 0xf9, 0xc3, 0x6a, 0x21, 0xb4, 0x5c, 0x39, 0x38, 0xcc, - 0xa2, 0x2c, 0x44, 0xfd, 0xab, 0x85, 0xf8, 0x47, 0xc9, 0xa6, 0x91, 0x20, 0xc9, 0x2b, 0xdf, 0x80, - 0xda, 0x0d, 0x84, 0x3a, 0xbb, 0xee, 0xd4, 0x8e, 0x0e, 0xec, 0x9a, 0xb7, 0xe0, 0x25, 0xa0, 0x75, - 0x68, 0xc4, 0x7d, 0x81, 0xf9, 0x93, 0x6c, 0xda, 0x62, 0x73, 0xbb, 0x65, 0xea, 0x77, 0xb7, 0x4c, - 0xa3, 0x4a, 0xcb, 0xa0, 0xf7, 0xa0, 0x81, 0xa7, 0x2c, 0x74, 0x34, 0xf5, 0x8e, 0x61, 0x20, 0x4c, - 0xba, 0xbf, 0xd7, 0xa1, 0xc1, 0xc7, 0x1f, 0x9a, 0x80, 0x2a, 0x34, 0x12, 0x75, 0xcd, 0xbb, 0x7f, - 0x68, 0x98, 0xf3, 0x0a, 0xad, 0xef, 0x96, 0xf2, 0x91, 0xc5, 0x9c, 0x80, 0x2a, 0xb4, 0xad, 0x60, - 0xc8, 0x9c, 0xe2, 0x16, 0x0c, 0x79, 0x4b, 0x3c, 0x27, 0xa0, 0x0a, 0xe1, 0x2a, 0x18, 0x32, 0xa7, - 0x94, 0x05, 0x43, 0xe6, 0x95, 0x11, 0x7d, 0x0f, 0xf5, 0x58, 0xe6, 0xd0, 0x93, 0x42, 0xce, 0x19, - 0xfd, 0xd4, 0x77, 0x4a, 0x78, 0xc8, 0x60, 0xe7, 0xb0, 0x7c, 0x88, 0x19, 0xb2, 0x0a, 0x79, 0xa6, - 0x9a, 0xa9, 0x3f, 0x29, 0xee, 0x20, 0x22, 0x75, 0xff, 0x55, 0x01, 0xd2, 0x67, 0x82, 0xa6, 0x71, - 0x1f, 0x39, 0x21, 0x43, 0x7b, 0xff, 0x87, 0xb4, 0x58, 0x23, 0xf5, 0x0f, 0x4a, 0xfb, 0xc9, 0x94, - 0x7f, 0x51, 0x60, 0x35, 0x99, 0xfd, 0xe8, 0x59, 0x09, 0x94, 0xbc, 0x3a, 0xe9, 0x1f, 0x56, 0x71, - 0x95, 0x1c, 0x22, 0xa8, 0xc7, 0xca, 0x80, 0xde, 0x2f, 0x8e, 0x91, 0x11, 0x24, 0x7d, 0xaf, 0xac, - 0x9b, 0x0c, 0x3b, 0x85, 0x06, 0x1f, 0xe5, 0x65, 0x8a, 0x9e, 0xd5, 0x90, 0x32, 0x45, 0xcf, 0x69, - 0x06, 0xfa, 0x11, 0x54, 0x31, 0xe0, 0x51, 0x09, 0x88, 0x9c, 0xb6, 0xe8, 0x4f, 0xcb, 0x3b, 0xa6, - 0xd5, 0x8e, 0x47, 0x7f, 0x99, 0x6a, 0x67, 0x14, 0xa7, 0x4c, 0xb5, 0xb3, 0x0a, 0x13, 0xe7, 0x2c, - 0x87, 0x74, 0xb9, 0x5e, 0x4d, 0x95, 0xa8, 0x4c, 0xce, 0x79, 0xe1, 0xe9, 0xbd, 0xbc, 0x7a, 0xd5, - 0x5e, 0xfa, 0xf3, 0x55, 0x7b, 0xe9, 0xe7, 0x59, 0x5b, 0xb9, 0x9a, 0xb5, 0x95, 0x3f, 0x66, 0x6d, - 0xe5, 0xef, 0x59, 0x5b, 0x79, 0xf9, 0x49, 0xd5, 0xbf, 0x97, 0x1f, 0xc9, 0xe5, 0xb7, 0xb5, 0x53, - 0x95, 0x6b, 0xc3, 0xee, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x89, 0x0a, 0xdb, 0xe4, 0xab, 0x0e, - 0x00, 0x00, + // 859 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0xeb, 0x44, + 0x14, 0xae, 0xf3, 0xe3, 0x36, 0x27, 0x54, 0x5c, 0x86, 0xde, 0x5e, 0xd7, 0x42, 0x49, 0xf1, 0xaa, + 0x42, 0x57, 0xf6, 0x6d, 0x2a, 0xca, 0x2d, 0x2c, 0xa0, 0x69, 0x21, 0x54, 0x02, 0x81, 0x1c, 0x10, + 0xd0, 0x4d, 0xe4, 0xc4, 0x93, 0xd4, 0xc2, 0xf1, 0x38, 0x9e, 0x71, 0x49, 0x05, 0x0b, 0x78, 0x03, + 0xde, 0x82, 0x47, 0xe0, 0x15, 0xba, 0x64, 0xc9, 0xaa, 0xd0, 0x2c, 0x79, 0x08, 0x84, 0x3c, 0x1e, + 0xd7, 0xf9, 0xa9, 0x8a, 0xed, 0xde, 0xdd, 0x78, 0x72, 0xbe, 0xef, 0x7c, 0xe7, 0xcc, 0xcc, 0x77, + 0x02, 0x9f, 0x8c, 0x1c, 0x76, 0x11, 0xf6, 0xf5, 0x01, 0x19, 0x1b, 0x03, 0xe2, 0x31, 0xcb, 0xf1, + 0x70, 0x60, 0xcf, 0x2f, 0x2d, 0xdf, 0x31, 0x28, 0x0e, 0x2e, 0x9d, 0x01, 0xa6, 0x06, 0xb5, 0x3c, + 0xbb, 0x4f, 0xa6, 0xc6, 0xe5, 0x7e, 0xb2, 0xd4, 0xfd, 0x80, 0x30, 0x82, 0x1a, 0x29, 0x42, 0x4f, + 0xa2, 0xf5, 0x24, 0xe4, 0x72, 0x5f, 0xdd, 0x19, 0x11, 0x32, 0x72, 0xb1, 0xc1, 0xa3, 0xfb, 0xe1, + 0xd0, 0xb0, 0xbc, 0xab, 0x18, 0xaa, 0x36, 0x97, 0x7f, 0x62, 0xce, 0x18, 0x53, 0x66, 0x8d, 0x7d, + 0x11, 0xb0, 0x35, 0x22, 0x23, 0xc2, 0x97, 0x46, 0xb4, 0x12, 0xbb, 0x2f, 0x33, 0x29, 0x67, 0x57, + 0x7e, 0x2a, 0x5b, 0x20, 0x0f, 0x73, 0x20, 0xc7, 0x24, 0xf4, 0x58, 0x8c, 0xd3, 0xbe, 0x00, 0xd4, + 0x65, 0x24, 0xc0, 0x27, 0x01, 0xb6, 0x18, 0x36, 0xf1, 0x24, 0xc4, 0x94, 0xa1, 0x23, 0x58, 0x17, + 0xf4, 0x8a, 0xb4, 0x2b, 0xed, 0xd5, 0x5b, 0x3b, 0xfa, 0x5c, 0x2f, 0x38, 0x8b, 0xde, 0x8d, 0x03, + 0xda, 0x95, 0xeb, 0x9b, 0xe6, 0x9a, 0x99, 0xc4, 0x6b, 0x5f, 0xc2, 0x9b, 0x0b, 0x84, 0xd4, 0x27, + 0x1e, 0xc5, 0x8f, 0x61, 0x1c, 0x09, 0x89, 0x5f, 0xfb, 0xf6, 0x2b, 0x91, 0x88, 0xb6, 0x41, 0x1e, + 0x3a, 0xd8, 0xb5, 0xa9, 0x52, 0xda, 0x2d, 0xef, 0xd5, 0x4c, 0xf1, 0x75, 0x27, 0x3d, 0x49, 0xf4, + 0x78, 0xe9, 0x6d, 0x21, 0xfd, 0x14, 0xbb, 0x38, 0x95, 0xfe, 0x1c, 0x40, 0x04, 0xf4, 0x1c, 0x9b, + 0x73, 0xd6, 0xda, 0x9b, 0xb3, 0x9b, 0x66, 0x4d, 0xb0, 0x9c, 0x9d, 0x9a, 0x35, 0x11, 0x70, 0x66, + 0x6b, 0x4f, 0x85, 0xaa, 0x84, 0x23, 0x56, 0xa5, 0x3d, 0x87, 0x27, 0x7c, 0xfb, 0x33, 0x87, 0xb2, + 0x84, 0x58, 0x81, 0xf5, 0xa1, 0xe3, 0x32, 0x1c, 0x50, 0x45, 0xe2, 0x95, 0x25, 0x9f, 0xda, 0xa7, + 0xf0, 0xc6, 0x5c, 0xb4, 0x28, 0xec, 0x00, 0x2a, 0xae, 0x43, 0x19, 0x8f, 0xcd, 0x50, 0x15, 0x0f, + 0xd6, 0x3e, 0x84, 0xd7, 0x39, 0x53, 0x07, 0xb3, 0x62, 0xf5, 0x74, 0x84, 0x70, 0x4e, 0x70, 0xa7, + 0x24, 0x73, 0x8b, 0xd3, 0xe6, 0xfe, 0x26, 0xc1, 0xf6, 0x09, 0xf1, 0x58, 0x40, 0x5c, 0x17, 0x07, + 0x5d, 0x66, 0x05, 0xc5, 0x14, 0x21, 0x03, 0xe4, 0x80, 0x10, 0x36, 0x8c, 0xef, 0x43, 0xbd, 0xf5, + 0x6c, 0x35, 0xf9, 0xe7, 0xd1, 0x93, 0x31, 0x45, 0x18, 0xd2, 0x61, 0x9d, 0xf8, 0xcc, 0x21, 0x1e, + 0x55, 0xca, 0x5c, 0xee, 0x96, 0x1e, 0xbf, 0x77, 0x3d, 0x79, 0xef, 0xfa, 0xb1, 0x77, 0x65, 0x26, + 0x41, 0xda, 0x77, 0xf0, 0x6c, 0x45, 0xa8, 0xa8, 0x3c, 0x9f, 0xd2, 0x27, 0x50, 0xf6, 0x1d, 0x5b, + 0x29, 0xed, 0x4a, 0x7b, 0x9b, 0x66, 0xb4, 0xd4, 0x5c, 0xd8, 0x99, 0xa3, 0xbe, 0x08, 0x99, 0x4d, + 0x7e, 0xf0, 0x8a, 0xb5, 0xe1, 0x6d, 0x78, 0x2d, 0x72, 0x29, 0x12, 0xb2, 0x1e, 0xc5, 0x03, 0x2a, + 0xb2, 0xd4, 0xc5, 0x5e, 0x17, 0x0f, 0xa8, 0xf6, 0x16, 0xa8, 0xf7, 0x65, 0x13, 0x57, 0xf2, 0x63, + 0x78, 0x9a, 0xfe, 0xfa, 0x8d, 0xe5, 0x14, 0xbc, 0x20, 0x3f, 0xcd, 0x1f, 0x6b, 0x4c, 0x23, 0x9a, + 0xd5, 0x84, 0x3a, 0x9e, 0x3a, 0xac, 0x47, 0x99, 0xc5, 0x42, 0xca, 0x89, 0x36, 0x4d, 0x88, 0xb6, + 0xba, 0x7c, 0x07, 0x1d, 0x43, 0x2d, 0xfa, 0xc2, 0x76, 0xcf, 0x62, 0x5c, 0x7f, 0xbd, 0xa5, 0xae, + 0x1c, 0xcd, 0x57, 0x89, 0x15, 0xb7, 0x37, 0xa2, 0x7b, 0xfd, 0xeb, 0x5f, 0x4d, 0xc9, 0xdc, 0x88, + 0x61, 0xc7, 0x4c, 0xeb, 0x2c, 0x9d, 0x15, 0x0b, 0x69, 0xb1, 0x32, 0xfe, 0x91, 0x40, 0x59, 0x65, + 0x12, 0x95, 0x6c, 0x43, 0xe9, 0x8e, 0x42, 0x9e, 0xdd, 0x34, 0x4b, 0x67, 0xa7, 0x66, 0xc9, 0xb9, + 0xe7, 0x80, 0xd1, 0x16, 0x54, 0xa3, 0x72, 0x31, 0xbf, 0x69, 0x35, 0x33, 0xfe, 0x58, 0xee, 0x44, + 0xe5, 0xe1, 0x4e, 0x54, 0x8b, 0x74, 0x02, 0xbd, 0x03, 0x55, 0x3c, 0x65, 0x81, 0xa5, 0xc8, 0x0f, + 0xdc, 0xf1, 0x38, 0xa4, 0xf5, 0x7b, 0x05, 0xaa, 0xfc, 0x55, 0xa3, 0x09, 0xc8, 0xb1, 0xf5, 0xa3, + 0x96, 0xfe, 0xf0, 0xfc, 0xd4, 0x57, 0x07, 0x8f, 0x7a, 0x90, 0x0b, 0x23, 0x9a, 0x39, 0x01, 0x39, + 0xb6, 0xec, 0x8c, 0x29, 0x17, 0x06, 0x49, 0xc6, 0x94, 0x4b, 0x33, 0x61, 0x02, 0x72, 0xec, 0xc7, + 0x19, 0x53, 0x2e, 0x0c, 0x80, 0x8c, 0x29, 0x17, 0x0d, 0x1f, 0x7d, 0x0f, 0x95, 0xc8, 0xbd, 0xd1, + 0x8b, 0x4c, 0xe0, 0xb9, 0xb1, 0xa0, 0xee, 0xe7, 0x40, 0x88, 0x64, 0x17, 0x50, 0xee, 0x60, 0x86, + 0x8c, 0x4c, 0xc8, 0x74, 0x14, 0xa8, 0x2f, 0xb2, 0x03, 0xe2, 0x4c, 0xad, 0x7f, 0xcb, 0x00, 0xe9, + 0x33, 0x41, 0xd3, 0xe8, 0x1e, 0x59, 0x01, 0x43, 0x87, 0xff, 0xc7, 0x74, 0xbf, 0xf5, 0xab, 0xef, + 0xe5, 0xc6, 0x89, 0x92, 0x7f, 0x91, 0x60, 0x23, 0xb1, 0x34, 0x74, 0x94, 0x83, 0x65, 0xd1, 0x74, + 0xd5, 0xf7, 0x8b, 0x40, 0x85, 0x86, 0x10, 0x2a, 0x91, 0xe1, 0xa1, 0x77, 0xb3, 0x73, 0xcc, 0xf9, + 0xac, 0x7a, 0x98, 0x17, 0x26, 0xd2, 0xfe, 0x08, 0xb2, 0xb0, 0x8d, 0x7c, 0xdd, 0x4b, 0xbd, 0x51, + 0x7d, 0x99, 0x1f, 0x18, 0x27, 0x6f, 0x9f, 0x5f, 0xdf, 0x36, 0xd6, 0xfe, 0xbc, 0x6d, 0xac, 0xfd, + 0x3c, 0x6b, 0x48, 0xd7, 0xb3, 0x86, 0xf4, 0xc7, 0xac, 0x21, 0xfd, 0x3d, 0x6b, 0x48, 0xe7, 0x1f, + 0x15, 0xfd, 0x1f, 0xff, 0x81, 0x58, 0x7e, 0x5b, 0xea, 0xcb, 0xdc, 0xad, 0x0e, 0xfe, 0x0b, 0x00, + 0x00, 0xff, 0xff, 0x36, 0x7e, 0xfa, 0xf8, 0x14, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1309,9 +1066,6 @@ type ControllerClient interface { Start(ctx context.Context, in *ControllerStartRequest, opts ...grpc.CallOption) (*ControllerStartResponse, error) Shutdown(ctx context.Context, in *ControllerShutdownRequest, opts ...grpc.CallOption) (*ControllerShutdownResponse, error) Wait(ctx context.Context, in *ControllerWaitRequest, opts ...grpc.CallOption) (*ControllerWaitResponse, error) - Pause(ctx context.Context, in *ControllerPauseRequest, opts ...grpc.CallOption) (*ControllerPauseResponse, error) - Resume(ctx context.Context, in *ControllerResumeRequest, opts ...grpc.CallOption) (*ControllerResumeResponse, error) - Ping(ctx context.Context, in *ControllerPingRequest, opts ...grpc.CallOption) (*ControllerPingResponse, error) Status(ctx context.Context, in *ControllerStatusRequest, opts ...grpc.CallOption) (*ControllerStatusResponse, error) } @@ -1350,33 +1104,6 @@ func (c *controllerClient) Wait(ctx context.Context, in *ControllerWaitRequest, return out, nil } -func (c *controllerClient) Pause(ctx context.Context, in *ControllerPauseRequest, opts ...grpc.CallOption) (*ControllerPauseResponse, error) { - out := new(ControllerPauseResponse) - err := c.cc.Invoke(ctx, "/containerd.services.sandbox.v1.Controller/Pause", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *controllerClient) Resume(ctx context.Context, in *ControllerResumeRequest, opts ...grpc.CallOption) (*ControllerResumeResponse, error) { - out := new(ControllerResumeResponse) - err := c.cc.Invoke(ctx, "/containerd.services.sandbox.v1.Controller/Resume", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - -func (c *controllerClient) Ping(ctx context.Context, in *ControllerPingRequest, opts ...grpc.CallOption) (*ControllerPingResponse, error) { - out := new(ControllerPingResponse) - err := c.cc.Invoke(ctx, "/containerd.services.sandbox.v1.Controller/Ping", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - func (c *controllerClient) Status(ctx context.Context, in *ControllerStatusRequest, opts ...grpc.CallOption) (*ControllerStatusResponse, error) { out := new(ControllerStatusResponse) err := c.cc.Invoke(ctx, "/containerd.services.sandbox.v1.Controller/Status", in, out, opts...) @@ -1391,9 +1118,6 @@ type ControllerServer interface { Start(context.Context, *ControllerStartRequest) (*ControllerStartResponse, error) Shutdown(context.Context, *ControllerShutdownRequest) (*ControllerShutdownResponse, error) Wait(context.Context, *ControllerWaitRequest) (*ControllerWaitResponse, error) - Pause(context.Context, *ControllerPauseRequest) (*ControllerPauseResponse, error) - Resume(context.Context, *ControllerResumeRequest) (*ControllerResumeResponse, error) - Ping(context.Context, *ControllerPingRequest) (*ControllerPingResponse, error) Status(context.Context, *ControllerStatusRequest) (*ControllerStatusResponse, error) } @@ -1410,15 +1134,6 @@ func (*UnimplementedControllerServer) Shutdown(ctx context.Context, req *Control func (*UnimplementedControllerServer) Wait(ctx context.Context, req *ControllerWaitRequest) (*ControllerWaitResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Wait not implemented") } -func (*UnimplementedControllerServer) Pause(ctx context.Context, req *ControllerPauseRequest) (*ControllerPauseResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Pause not implemented") -} -func (*UnimplementedControllerServer) Resume(ctx context.Context, req *ControllerResumeRequest) (*ControllerResumeResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Resume not implemented") -} -func (*UnimplementedControllerServer) Ping(ctx context.Context, req *ControllerPingRequest) (*ControllerPingResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Ping not implemented") -} func (*UnimplementedControllerServer) Status(ctx context.Context, req *ControllerStatusRequest) (*ControllerStatusResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Status not implemented") } @@ -1481,60 +1196,6 @@ func _Controller_Wait_Handler(srv interface{}, ctx context.Context, dec func(int return interceptor(ctx, in, info, handler) } -func _Controller_Pause_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ControllerPauseRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ControllerServer).Pause(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/containerd.services.sandbox.v1.Controller/Pause", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ControllerServer).Pause(ctx, req.(*ControllerPauseRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Controller_Resume_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ControllerResumeRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ControllerServer).Resume(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/containerd.services.sandbox.v1.Controller/Resume", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ControllerServer).Resume(ctx, req.(*ControllerResumeRequest)) - } - return interceptor(ctx, in, info, handler) -} - -func _Controller_Ping_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ControllerPingRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ControllerServer).Ping(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/containerd.services.sandbox.v1.Controller/Ping", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ControllerServer).Ping(ctx, req.(*ControllerPingRequest)) - } - return interceptor(ctx, in, info, handler) -} - func _Controller_Status_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(ControllerStatusRequest) if err := dec(in); err != nil { @@ -1569,18 +1230,6 @@ var _Controller_serviceDesc = grpc.ServiceDesc{ MethodName: "Wait", Handler: _Controller_Wait_Handler, }, - { - MethodName: "Pause", - Handler: _Controller_Pause_Handler, - }, - { - MethodName: "Resume", - Handler: _Controller_Resume_Handler, - }, - { - MethodName: "Ping", - Handler: _Controller_Ping_Handler, - }, { MethodName: "Status", Handler: _Controller_Status_Handler, @@ -2197,189 +1846,6 @@ func (m *ControllerWaitResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } -func (m *ControllerPauseRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ControllerPauseRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ControllerPauseRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.SandboxID) > 0 { - i -= len(m.SandboxID) - copy(dAtA[i:], m.SandboxID) - i = encodeVarintSandbox(dAtA, i, uint64(len(m.SandboxID))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ControllerPauseResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ControllerPauseResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ControllerPauseResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - return len(dAtA) - i, nil -} - -func (m *ControllerResumeRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ControllerResumeRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ControllerResumeRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.SandboxID) > 0 { - i -= len(m.SandboxID) - copy(dAtA[i:], m.SandboxID) - i = encodeVarintSandbox(dAtA, i, uint64(len(m.SandboxID))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ControllerResumeResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ControllerResumeResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ControllerResumeResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - return len(dAtA) - i, nil -} - -func (m *ControllerPingRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ControllerPingRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ControllerPingRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - if len(m.SandboxID) > 0 { - i -= len(m.SandboxID) - copy(dAtA[i:], m.SandboxID) - i = encodeVarintSandbox(dAtA, i, uint64(len(m.SandboxID))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *ControllerPingResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ControllerPingResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ControllerPingResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } - return len(dAtA) - i, nil -} - func (m *ControllerStatusRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2763,90 +2229,6 @@ func (m *ControllerWaitResponse) Size() (n int) { return n } -func (m *ControllerPauseRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.SandboxID) - if l > 0 { - n += 1 + l + sovSandbox(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *ControllerPauseResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *ControllerResumeRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.SandboxID) - if l > 0 { - n += 1 + l + sovSandbox(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *ControllerResumeResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *ControllerPingRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.SandboxID) - if l > 0 { - n += 1 + l + sovSandbox(uint64(l)) - } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - -func (m *ControllerPingResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } - return n -} - func (m *ControllerStatusRequest) Size() (n int) { if m == nil { return 0 @@ -3091,69 +2473,6 @@ func (this *ControllerWaitResponse) String() string { }, "") return s } -func (this *ControllerPauseRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ControllerPauseRequest{`, - `SandboxID:` + fmt.Sprintf("%v", this.SandboxID) + `,`, - `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, - `}`, - }, "") - return s -} -func (this *ControllerPauseResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ControllerPauseResponse{`, - `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, - `}`, - }, "") - return s -} -func (this *ControllerResumeRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ControllerResumeRequest{`, - `SandboxID:` + fmt.Sprintf("%v", this.SandboxID) + `,`, - `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, - `}`, - }, "") - return s -} -func (this *ControllerResumeResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ControllerResumeResponse{`, - `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, - `}`, - }, "") - return s -} -func (this *ControllerPingRequest) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ControllerPingRequest{`, - `SandboxID:` + fmt.Sprintf("%v", this.SandboxID) + `,`, - `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, - `}`, - }, "") - return s -} -func (this *ControllerPingResponse) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&ControllerPingResponse{`, - `XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`, - `}`, - }, "") - return s -} func (this *ControllerStatusRequest) String() string { if this == nil { return "nil" @@ -4623,408 +3942,6 @@ func (m *ControllerWaitResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *ControllerPauseRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ControllerPauseRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ControllerPauseRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SandboxID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSandbox - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSandbox - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SandboxID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipSandbox(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSandbox - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ControllerPauseResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ControllerPauseResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ControllerPauseResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipSandbox(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSandbox - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ControllerResumeRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ControllerResumeRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ControllerResumeRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SandboxID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSandbox - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSandbox - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SandboxID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipSandbox(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSandbox - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ControllerResumeResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ControllerResumeResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ControllerResumeResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipSandbox(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSandbox - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ControllerPingRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ControllerPingRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ControllerPingRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SandboxID", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthSandbox - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthSandbox - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SandboxID = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipSandbox(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSandbox - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *ControllerPingResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSandbox - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ControllerPingResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ControllerPingResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipSandbox(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSandbox - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ControllerStatusRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/api/services/sandbox/v1/sandbox.proto b/api/services/sandbox/v1/sandbox.proto index 862f5eee6..a3e5d9753 100644 --- a/api/services/sandbox/v1/sandbox.proto +++ b/api/services/sandbox/v1/sandbox.proto @@ -89,9 +89,6 @@ service Controller { rpc Start(ControllerStartRequest) returns (ControllerStartResponse); rpc Shutdown(ControllerShutdownRequest) returns (ControllerShutdownResponse); rpc Wait(ControllerWaitRequest) returns (ControllerWaitResponse); - rpc Pause(ControllerPauseRequest) returns (ControllerPauseResponse); - rpc Resume(ControllerResumeRequest) returns (ControllerResumeResponse); - rpc Ping(ControllerPingRequest) returns (ControllerPingResponse); rpc Status(ControllerStatusRequest) returns (ControllerStatusResponse); } @@ -122,24 +119,6 @@ message ControllerWaitResponse { google.protobuf.Timestamp exited_at = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; } -message ControllerPauseRequest { - string sandbox_id = 1; -} - -message ControllerPauseResponse {} - -message ControllerResumeRequest { - string sandbox_id = 1; -} - -message ControllerResumeResponse {} - -message ControllerPingRequest { - string sandbox_id = 1; -} - -message ControllerPingResponse {} - message ControllerStatusRequest { string sandbox_id = 1; } diff --git a/cmd/ctr/commands/sandboxes/sandboxes.go b/cmd/ctr/commands/sandboxes/sandboxes.go index 9d1935bf3..7e639afb2 100644 --- a/cmd/ctr/commands/sandboxes/sandboxes.go +++ b/cmd/ctr/commands/sandboxes/sandboxes.go @@ -38,7 +38,6 @@ var Command = cli.Command{ runCommand, listCommand, removeCommand, - pingCommand, }, } @@ -177,30 +176,3 @@ var removeCommand = cli.Command{ return nil }, } - -var pingCommand = cli.Command{ - Name: "ping", - ArgsUsage: " [, ...]", - Usage: "ping sandbox", - Action: func(context *cli.Context) error { - client, ctx, cancel, err := commands.NewClient(context) - if err != nil { - return err - } - defer cancel() - - for _, id := range context.Args() { - sandbox, err := client.LoadSandbox(ctx, id) - if err != nil { - return fmt.Errorf("failed to load sandbox %s: %w", id, err) - } - - err = sandbox.Ping(ctx) - if err != nil { - return fmt.Errorf("failed to ping %s: %w", id, err) - } - } - - return nil - }, -} diff --git a/sandbox.go b/sandbox.go index b6225648c..1e949aac8 100644 --- a/sandbox.go +++ b/sandbox.go @@ -47,12 +47,6 @@ type Sandbox interface { Wait(ctx context.Context) (<-chan ExitStatus, error) // Delete removes sandbox from the metadata store. Delete(ctx context.Context) error - // Pause will freeze running sandbox instance - Pause(ctx context.Context) error - // Resume will unfreeze previously paused sandbox instance - Resume(ctx context.Context) error - // Ping will check whether existing sandbox instance alive - Ping(ctx context.Context) error } type sandboxClient struct { @@ -127,18 +121,6 @@ func (s *sandboxClient) Delete(ctx context.Context) error { return s.client.SandboxStore().Delete(ctx, s.ID()) } -func (s *sandboxClient) Pause(ctx context.Context) error { - return s.client.SandboxController().Pause(ctx, s.ID()) -} - -func (s *sandboxClient) Resume(ctx context.Context) error { - return s.client.SandboxController().Resume(ctx, s.ID()) -} - -func (s *sandboxClient) Ping(ctx context.Context) error { - return s.client.SandboxController().Ping(ctx, s.ID()) -} - // NewSandbox creates new sandbox client func (c *Client) NewSandbox(ctx context.Context, sandboxID string, opts ...NewSandboxOpts) (Sandbox, error) { if sandboxID == "" { diff --git a/sandbox/controller.go b/sandbox/controller.go index 6b77f3cae..925307829 100644 --- a/sandbox/controller.go +++ b/sandbox/controller.go @@ -49,14 +49,6 @@ type Controller interface { Shutdown(ctx context.Context, sandboxID string) error // Wait blocks until sandbox process exits. Wait(ctx context.Context, sandboxID string) (*sandbox.ControllerWaitResponse, error) - // Pause will freeze running sandbox instance. - // Shim implementations may return ErrNotImplemented if this is out of scope of a given sandbox. - Pause(ctx context.Context, sandboxID string) error - // Resume will unfreeze previously paused sandbox instance - Resume(ctx context.Context, sandboxID string) error - // Ping is a lightweight API call to check whether sandbox instance is still alive (e.g. quick livability check). - // This should not involve any complex logic and containerd will not debug log it as it might be called quite often. - Ping(ctx context.Context, sandboxID string) error // Status will query sandbox process status. It is heavier than Ping call and must be used whenever you need to // gather metadata about current sandbox state (status, uptime, resource use, etc). Status(ctx context.Context, sandboxID string) (*sandbox.ControllerStatusResponse, error) diff --git a/sandbox_controller.go b/sandbox_controller.go index 2093783bd..17e91889b 100644 --- a/sandbox_controller.go +++ b/sandbox_controller.go @@ -63,32 +63,6 @@ func (s *sandboxRemoteController) Wait(ctx context.Context, sandboxID string) (* return resp, nil } -func (s *sandboxRemoteController) Pause(ctx context.Context, sandboxID string) error { - _, err := s.client.Pause(ctx, &api.ControllerPauseRequest{SandboxID: sandboxID}) - if err != nil { - return errdefs.FromGRPC(err) - } - - return nil -} - -func (s *sandboxRemoteController) Resume(ctx context.Context, sandboxID string) error { - _, err := s.client.Resume(ctx, &api.ControllerResumeRequest{SandboxID: sandboxID}) - if err != nil { - return errdefs.FromGRPC(err) - } - - return nil -} - -func (s *sandboxRemoteController) Ping(ctx context.Context, sandboxID string) error { - if _, err := s.client.Ping(ctx, &api.ControllerPingRequest{SandboxID: sandboxID}); err != nil { - return errdefs.FromGRPC(err) - } - - return nil -} - func (s *sandboxRemoteController) Status(ctx context.Context, sandboxID string) (*api.ControllerStatusResponse, error) { resp, err := s.client.Status(ctx, &api.ControllerStatusRequest{SandboxID: sandboxID}) if err != nil { diff --git a/services/sandbox/controller_local.go b/services/sandbox/controller_local.go index 8ea42096f..a4b62088c 100644 --- a/services/sandbox/controller_local.go +++ b/services/sandbox/controller_local.go @@ -32,7 +32,6 @@ import ( proto "github.com/containerd/containerd/runtime/v2/task" "github.com/containerd/containerd/sandbox" "github.com/containerd/containerd/services" - "github.com/pkg/errors" "google.golang.org/grpc" ) @@ -165,51 +164,6 @@ func (c *controllerLocal) Wait(ctx context.Context, in *api.ControllerWaitReques }, nil } -func (c *controllerLocal) Pause(ctx context.Context, in *api.ControllerPauseRequest, opts ...grpc.CallOption) (*api.ControllerPauseResponse, error) { - svc, err := c.getSandbox(ctx, in.SandboxID) - if err != nil { - return nil, err - } - - if _, err := svc.PauseSandbox(ctx, &proto.PauseSandboxRequest{ - SandboxID: in.SandboxID, - }); err != nil { - return nil, errors.Wrapf(err, "failed to resume sandbox %s", in.SandboxID) - } - - return &api.ControllerPauseResponse{}, nil -} - -func (c *controllerLocal) Resume(ctx context.Context, in *api.ControllerResumeRequest, opts ...grpc.CallOption) (*api.ControllerResumeResponse, error) { - svc, err := c.getSandbox(ctx, in.SandboxID) - if err != nil { - return nil, err - } - - if _, err := svc.ResumeSandbox(ctx, &proto.ResumeSandboxRequest{ - SandboxID: in.SandboxID, - }); err != nil { - return nil, errors.Wrapf(err, "failed to resume sandbox %s", in.SandboxID) - } - - return &api.ControllerResumeResponse{}, nil -} - -func (c *controllerLocal) Ping(ctx context.Context, in *api.ControllerPingRequest, opts ...grpc.CallOption) (*api.ControllerPingResponse, error) { - svc, err := c.getSandbox(ctx, in.SandboxID) - if err != nil { - return nil, err - } - - if _, err := svc.PingSandbox(ctx, &proto.PingRequest{ - SandboxID: in.SandboxID, - }); err != nil { - return nil, err - } - - return &api.ControllerPingResponse{}, nil -} - func (c *controllerLocal) Status(ctx context.Context, in *api.ControllerStatusRequest, opts ...grpc.CallOption) (*api.ControllerStatusResponse, error) { svc, err := c.getSandbox(ctx, in.SandboxID) if err != nil { diff --git a/services/sandbox/controller_service.go b/services/sandbox/controller_service.go index 47270e5a9..12dc5b08a 100644 --- a/services/sandbox/controller_service.go +++ b/services/sandbox/controller_service.go @@ -83,20 +83,6 @@ func (s *controllerService) Wait(ctx context.Context, req *api.ControllerWaitReq return s.local.Wait(ctx, req) } -func (s *controllerService) Pause(ctx context.Context, req *api.ControllerPauseRequest) (*api.ControllerPauseResponse, error) { - log.G(ctx).WithField("req", req).Debug("pause sandbox") - return s.local.Pause(ctx, req) -} - -func (s *controllerService) Resume(ctx context.Context, req *api.ControllerResumeRequest) (*api.ControllerResumeResponse, error) { - log.G(ctx).WithField("req", req).Debug("resume sandbox") - return s.local.Resume(ctx, req) -} - -func (s *controllerService) Ping(ctx context.Context, req *api.ControllerPingRequest) (*api.ControllerPingResponse, error) { - return s.local.Ping(ctx, req) -} - func (s *controllerService) Status(ctx context.Context, req *api.ControllerStatusRequest) (*api.ControllerStatusResponse, error) { log.G(ctx).WithField("req", req).Debug("sandbox status") return s.local.Status(ctx, req)