diff --git a/internal/core/linuxvm/ctr.go b/internal/core/linuxvm/ctr.go index 5eadc93220..29b40b8a1d 100644 --- a/internal/core/linuxvm/ctr.go +++ b/internal/core/linuxvm/ctr.go @@ -7,7 +7,6 @@ import ( "github.com/Microsoft/hcsshim/internal/core" "github.com/Microsoft/hcsshim/internal/cow" "github.com/Microsoft/hcsshim/internal/protocol/guestresource" - "github.com/opencontainers/runtime-spec/specs-go" ) type ctr struct { @@ -20,10 +19,9 @@ type ctr struct { var _ core.Ctr = (*ctr)(nil) -func newCtr(innerCtr cow.Container, processSpec *specs.Process, io cmd.UpstreamIO) *ctr { +func newCtr(innerCtr cow.Container, io cmd.UpstreamIO) *ctr { cmd := &cmd.Cmd{ Host: innerCtr, - Spec: processSpec, } if io != nil { cmd.Stdin = io.Stdin() diff --git a/internal/core/linuxvm/sandbox.go b/internal/core/linuxvm/sandbox.go index 33e90ba2ff..0607bf0b7b 100644 --- a/internal/core/linuxvm/sandbox.go +++ b/internal/core/linuxvm/sandbox.go @@ -44,6 +44,7 @@ type Sandbox struct { netns string endpoints map[string]string // VM NIC ID -> guest interface ID isLMSrc bool + ifaces []*statepkg.GuestInterface } type translator struct { @@ -162,6 +163,7 @@ func NewSandbox(ctx context.Context, id string, l *layers.LCOWLayers2, spec *spe }() netns := oci.GetNetNS(spec) + var ifaces []*statepkg.GuestInterface if netns != "" { endpoints, err := hns.GetNamespaceEndpoints(netns) if err != nil { @@ -191,6 +193,7 @@ func NewSandbox(ctx context.Context, id string, l *layers.LCOWLayers2, spec *spe }); err != nil { return nil, err } + ifaces = append(ifaces, &statepkg.GuestInterface{Nsid: guestNamespaceID.String(), Id: g.String()}) } } @@ -229,6 +232,7 @@ func NewSandbox(ctx context.Context, id string, l *layers.LCOWLayers2, spec *spe allowMigration: allowMigration, netns: netns, waitCh: make(chan struct{}), + ifaces: ifaces, }, nil } @@ -345,7 +349,7 @@ func createCtr(ctx context.Context, c *core.LinuxCtrConfig, t *translator, gt *g if err != nil { return nil, err } - return newCtr(ctr, c.Spec.Process, c.IO), nil + return newCtr(ctr, c.IO), nil } func (t *translator) translate(ctx context.Context, c *core.LinuxCtrConfig) (_ *guestConfig, _ []resources.ResourceCloser, err error) { @@ -565,17 +569,20 @@ func (s *Sandbox) LMPrepare(ctx context.Context) (_ *statepkg.SandboxState, _ *c intResources = append(intResources, intR) } s.isLMSrc = true + vmConfig := s.vm.Config() + vmConfig.NICs = nil return &statepkg.SandboxState{ Vm: &statepkg.VMState{ - Config: statepkg.VMConfigFromInternal(s.vm.Config()), + Config: statepkg.VMConfigFromInternal(vmConfig), CompatInfo: compatInfo, Resources: intResources, }, - Agent: s.gm.State(), + Agent: s.gm.State(), + Ifaces: s.ifaces, }, resources, nil } -func NewLMSandbox(ctx context.Context, id string, config *statepkg.SandboxState, annos map[string]string) (_ core.Migratable, err error) { +func NewLMSandbox(ctx context.Context, id string, config *statepkg.SandboxState, netns string, annos map[string]string) (_ core.Migratable, err error) { logrus.WithField("config", config).Info("creating lm sandbox with config") vmConfig := statepkg.VMConfigToInternal(config.Vm.Config) vmConfig.Serial = annos["io.microsoft.virtualmachine.console.pipe"] @@ -600,6 +607,8 @@ func NewLMSandbox(ctx context.Context, id string, config *statepkg.SandboxState, resources: make(map[string]resourceUseLayers), }, waitCh: make(chan struct{}), + netns: netns, + ifaces: config.Ifaces, }, nil } @@ -619,7 +628,42 @@ func (s *Sandbox) LMFinalize(ctx context.Context) error { if err := s.gm.Start(ctx, false); err != nil { return err } - // TODO: Reconnect GCS, etc. + for _, iface := range s.ifaces { + if err := s.gm.RemoveNetworkInterface(ctx, iface.Nsid, iface.Id); err != nil { + return fmt.Errorf("remove iface %s from ns %s: %w", iface.Id, iface.Nsid) + } + } + if s.netns != "" { + endpoints, err := hns.GetNamespaceEndpoints(s.netns) + if err != nil { + return fmt.Errorf("find netns endpoints: %w", err) + } + for _, endpointID := range endpoints { + endpoint, err := hns.GetHNSEndpointByID(endpointID) + if err != nil { + return err + } + g, err := guid.NewV4() + if err != nil { + return err + } + if err := s.vm.AddNIC(ctx, g.String(), vmpkg.NIC{EndpointID: endpoint.Id, MACAddress: endpoint.MacAddress}); err != nil { + return err + } + if err := s.gm.AddNetworkInterface(ctx, guestNamespaceID.String(), g.String(), &guestmanager.InterfaceConfig{ + MACAddress: endpoint.MacAddress, + IPAddress: endpoint.IPAddress.String(), + PrefixLength: endpoint.PrefixLength, + GatewayAddress: endpoint.GatewayAddress, + DNSSuffix: endpoint.DNSSuffix, + DNSServerList: endpoint.DNSServerList, + EnableLowMetric: endpoint.EnableLowMetric, + EncapOverhead: endpoint.EncapOverhead, + }); err != nil { + return err + } + } + } return nil } diff --git a/internal/gcs/process.go b/internal/gcs/process.go index 25ee89b3af..51fed4fa42 100644 --- a/internal/gcs/process.go +++ b/internal/gcs/process.go @@ -180,14 +180,20 @@ func (p *Process) Close() error { trace.StringAttribute("cid", p.cid), trace.Int64Attribute("pid", int64(p.id))) - if err := p.stdin.Close(); err != nil { - log.G(ctx).WithError(err).Warn("close stdin failed") + if p.stdin != nil { + if err := p.stdin.Close(); err != nil { + log.G(ctx).WithError(err).Warn("close stdin failed") + } } - if err := p.stdout.Close(); err != nil { - log.G(ctx).WithError(err).Warn("close stdout failed") + if p.stdout != nil { + if err := p.stdout.Close(); err != nil { + log.G(ctx).WithError(err).Warn("close stdout failed") + } } - if err := p.stderr.Close(); err != nil { - log.G(ctx).WithError(err).Warn("close stderr failed") + if p.stderr != nil { + if err := p.stderr.Close(); err != nil { + log.G(ctx).WithError(err).Warn("close stderr failed") + } } p.gc.mu.Lock() defer p.gc.mu.Unlock() diff --git a/internal/state/state.pb.go b/internal/state/state.pb.go index 6b4f30bfc9..259e111902 100644 --- a/internal/state/state.pb.go +++ b/internal/state/state.pb.go @@ -66,7 +66,7 @@ func (x SCSIAttachment_AttachmentType) Number() protoreflect.EnumNumber { // Deprecated: Use SCSIAttachment_AttachmentType.Descriptor instead. func (SCSIAttachment_AttachmentType) EnumDescriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{6, 0} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{8, 0} } type TaskServerState struct { @@ -129,8 +129,10 @@ type SandboxState struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Vm *VMState `protobuf:"bytes,1,opt,name=vm,proto3" json:"vm,omitempty"` - Agent *GCState `protobuf:"bytes,2,opt,name=agent,proto3" json:"agent,omitempty"` + Vm *VMState `protobuf:"bytes,1,opt,name=vm,proto3" json:"vm,omitempty"` + Agent *GCState `protobuf:"bytes,2,opt,name=agent,proto3" json:"agent,omitempty"` + Ifaces []*GuestInterface `protobuf:"bytes,4,rep,name=ifaces,proto3" json:"ifaces,omitempty"` + Containers map[string]*Container `protobuf:"bytes,3,rep,name=containers,proto3" json:"containers,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *SandboxState) Reset() { @@ -179,6 +181,122 @@ func (x *SandboxState) GetAgent() *GCState { return nil } +func (x *SandboxState) GetIfaces() []*GuestInterface { + if x != nil { + return x.Ifaces + } + return nil +} + +func (x *SandboxState) GetContainers() map[string]*Container { + if x != nil { + return x.Containers + } + return nil +} + +type GuestInterface struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Nsid string `protobuf:"bytes,1,opt,name=nsid,proto3" json:"nsid,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` +} + +func (x *GuestInterface) Reset() { + *x = GuestInterface{} + if protoimpl.UnsafeEnabled { + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GuestInterface) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GuestInterface) ProtoMessage() {} + +func (x *GuestInterface) ProtoReflect() protoreflect.Message { + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GuestInterface.ProtoReflect.Descriptor instead. +func (*GuestInterface) Descriptor() ([]byte, []int) { + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{2} +} + +func (x *GuestInterface) GetNsid() string { + if x != nil { + return x.Nsid + } + return "" +} + +func (x *GuestInterface) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +type Container struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + InitPid uint32 `protobuf:"varint,1,opt,name=init_pid,json=initPid,proto3" json:"init_pid,omitempty"` +} + +func (x *Container) Reset() { + *x = Container{} + if protoimpl.UnsafeEnabled { + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Container) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Container) ProtoMessage() {} + +func (x *Container) ProtoReflect() protoreflect.Message { + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Container.ProtoReflect.Descriptor instead. +func (*Container) Descriptor() ([]byte, []int) { + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{3} +} + +func (x *Container) GetInitPid() uint32 { + if x != nil { + return x.InitPid + } + return 0 +} + type VMState struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -192,7 +310,7 @@ type VMState struct { func (x *VMState) Reset() { *x = VMState{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[2] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -205,7 +323,7 @@ func (x *VMState) String() string { func (*VMState) ProtoMessage() {} func (x *VMState) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[2] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -218,7 +336,7 @@ func (x *VMState) ProtoReflect() protoreflect.Message { // Deprecated: Use VMState.ProtoReflect.Descriptor instead. func (*VMState) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{2} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{4} } func (x *VMState) GetConfig() *VMConfig { @@ -257,7 +375,7 @@ type VMConfig struct { func (x *VMConfig) Reset() { *x = VMConfig{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[3] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -270,7 +388,7 @@ func (x *VMConfig) String() string { func (*VMConfig) ProtoMessage() {} func (x *VMConfig) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[3] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -283,7 +401,7 @@ func (x *VMConfig) ProtoReflect() protoreflect.Message { // Deprecated: Use VMConfig.ProtoReflect.Descriptor instead. func (*VMConfig) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{3} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{5} } func (x *VMConfig) GetVpCount() int32 { @@ -333,7 +451,7 @@ type NIC struct { func (x *NIC) Reset() { *x = NIC{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[4] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -346,7 +464,7 @@ func (x *NIC) String() string { func (*NIC) ProtoMessage() {} func (x *NIC) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[4] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -359,7 +477,7 @@ func (x *NIC) ProtoReflect() protoreflect.Message { // Deprecated: Use NIC.ProtoReflect.Descriptor instead. func (*NIC) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{4} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{6} } func (x *NIC) GetEndpointId() string { @@ -387,7 +505,7 @@ type SCSIController struct { func (x *SCSIController) Reset() { *x = SCSIController{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[5] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -400,7 +518,7 @@ func (x *SCSIController) String() string { func (*SCSIController) ProtoMessage() {} func (x *SCSIController) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[5] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -413,7 +531,7 @@ func (x *SCSIController) ProtoReflect() protoreflect.Message { // Deprecated: Use SCSIController.ProtoReflect.Descriptor instead. func (*SCSIController) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{5} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{7} } func (x *SCSIController) GetAttachments() map[uint32]*SCSIAttachment { @@ -437,7 +555,7 @@ type SCSIAttachment struct { func (x *SCSIAttachment) Reset() { *x = SCSIAttachment{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[6] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -450,7 +568,7 @@ func (x *SCSIAttachment) String() string { func (*SCSIAttachment) ProtoMessage() {} func (x *SCSIAttachment) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[6] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -463,7 +581,7 @@ func (x *SCSIAttachment) ProtoReflect() protoreflect.Message { // Deprecated: Use SCSIAttachment.ProtoReflect.Descriptor instead. func (*SCSIAttachment) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{6} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{8} } func (x *SCSIAttachment) GetType() SCSIAttachment_AttachmentType { @@ -508,7 +626,7 @@ type Resource struct { func (x *Resource) Reset() { *x = Resource{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[7] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -521,7 +639,7 @@ func (x *Resource) String() string { func (*Resource) ProtoMessage() {} func (x *Resource) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[7] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -534,7 +652,7 @@ func (x *Resource) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource.ProtoReflect.Descriptor instead. func (*Resource) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{7} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{9} } func (m *Resource) GetType() isResource_Type { @@ -570,7 +688,7 @@ type GuestState struct { func (x *GuestState) Reset() { *x = GuestState{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[8] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -583,7 +701,7 @@ func (x *GuestState) String() string { func (*GuestState) ProtoMessage() {} func (x *GuestState) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[8] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -596,7 +714,7 @@ func (x *GuestState) ProtoReflect() protoreflect.Message { // Deprecated: Use GuestState.ProtoReflect.Descriptor instead. func (*GuestState) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{8} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{10} } type GuestStateDisconnected struct { @@ -610,7 +728,7 @@ type GuestStateDisconnected struct { func (x *GuestStateDisconnected) Reset() { *x = GuestStateDisconnected{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[9] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -623,7 +741,7 @@ func (x *GuestStateDisconnected) String() string { func (*GuestStateDisconnected) ProtoMessage() {} func (x *GuestStateDisconnected) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[9] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -636,7 +754,7 @@ func (x *GuestStateDisconnected) ProtoReflect() protoreflect.Message { // Deprecated: Use GuestStateDisconnected.ProtoReflect.Descriptor instead. func (*GuestStateDisconnected) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{9} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{11} } func (x *GuestStateDisconnected) GetCommon() *GuestState { @@ -657,7 +775,7 @@ type GuestStateConnected struct { func (x *GuestStateConnected) Reset() { *x = GuestStateConnected{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[10] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -670,7 +788,7 @@ func (x *GuestStateConnected) String() string { func (*GuestStateConnected) ProtoMessage() {} func (x *GuestStateConnected) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[10] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -683,7 +801,7 @@ func (x *GuestStateConnected) ProtoReflect() protoreflect.Message { // Deprecated: Use GuestStateConnected.ProtoReflect.Descriptor instead. func (*GuestStateConnected) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{10} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{12} } func (x *GuestStateConnected) GetCommon() *GuestState { @@ -705,7 +823,7 @@ type GCState struct { func (x *GCState) Reset() { *x = GCState{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[11] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -718,7 +836,7 @@ func (x *GCState) String() string { func (*GCState) ProtoMessage() {} func (x *GCState) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[11] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -731,7 +849,7 @@ func (x *GCState) ProtoReflect() protoreflect.Message { // Deprecated: Use GCState.ProtoReflect.Descriptor instead. func (*GCState) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{11} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{13} } func (x *GCState) GetProcesses() []*Process { @@ -763,7 +881,7 @@ type Process struct { func (x *Process) Reset() { *x = Process{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[12] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -776,7 +894,7 @@ func (x *Process) String() string { func (*Process) ProtoMessage() {} func (x *Process) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[12] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -789,7 +907,7 @@ func (x *Process) ProtoReflect() protoreflect.Message { // Deprecated: Use Process.ProtoReflect.Descriptor instead. func (*Process) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{12} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{14} } func (x *Process) GetContainerId() string { @@ -841,7 +959,7 @@ type TaskState struct { func (x *TaskState) Reset() { *x = TaskState{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[13] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -854,7 +972,7 @@ func (x *TaskState) String() string { func (*TaskState) ProtoMessage() {} func (x *TaskState) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[13] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -867,7 +985,7 @@ func (x *TaskState) ProtoReflect() protoreflect.Message { // Deprecated: Use TaskState.ProtoReflect.Descriptor instead. func (*TaskState) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{13} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{15} } func (x *TaskState) GetTaskId() string { @@ -911,7 +1029,7 @@ type Resource_Layers struct { func (x *Resource_Layers) Reset() { *x = Resource_Layers{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[18] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -924,7 +1042,7 @@ func (x *Resource_Layers) String() string { func (*Resource_Layers) ProtoMessage() {} func (x *Resource_Layers) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[18] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -937,7 +1055,7 @@ func (x *Resource_Layers) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Layers.ProtoReflect.Descriptor instead. func (*Resource_Layers) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{7, 0} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{9, 0} } func (x *Resource_Layers) GetTaskId() string { @@ -973,7 +1091,7 @@ type Resource_Layers_SCSI struct { func (x *Resource_Layers_SCSI) Reset() { *x = Resource_Layers_SCSI{} if protoimpl.UnsafeEnabled { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[19] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -986,7 +1104,7 @@ func (x *Resource_Layers_SCSI) String() string { func (*Resource_Layers_SCSI) ProtoMessage() {} func (x *Resource_Layers_SCSI) ProtoReflect() protoreflect.Message { - mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[19] + mi := &file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -999,7 +1117,7 @@ func (x *Resource_Layers_SCSI) ProtoReflect() protoreflect.Message { // Deprecated: Use Resource_Layers_SCSI.ProtoReflect.Descriptor instead. func (*Resource_Layers_SCSI) Descriptor() ([]byte, []int) { - return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{7, 0, 0} + return file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP(), []int{9, 0, 0} } func (x *Resource_Layers_SCSI) GetController() uint32 { @@ -1040,149 +1158,171 @@ var file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDesc = []byt 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x7e, 0x0a, 0x0c, - 0x53, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, 0x02, - 0x76, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x4d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x02, 0x76, - 0x6d, 0x12, 0x39, 0x0a, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, - 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x47, 0x43, - 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x22, 0xac, 0x01, 0x0a, - 0x07, 0x56, 0x4d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3c, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, - 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, - 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x63, 0x6f, 0x6d, - 0x70, 0x61, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, - 0x72, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, - 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, - 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0xab, 0x03, 0x0a, 0x08, - 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x76, 0x70, 0x5f, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, 0x70, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0c, 0x6d, 0x65, 0x6d, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x6d, 0x65, 0x6d, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x4d, 0x62, 0x12, 0x1b, 0x0a, 0x09, 0x76, 0x61, 0x5f, 0x62, 0x61, 0x63, 0x6b, - 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x76, 0x61, 0x42, 0x61, 0x63, 0x6b, - 0x65, 0x64, 0x12, 0x42, 0x0a, 0x04, 0x73, 0x63, 0x73, 0x69, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x2e, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, - 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x4d, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x53, 0x63, 0x73, 0x69, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x04, 0x73, 0x63, 0x73, 0x69, 0x12, 0x42, 0x0a, 0x04, 0x6e, 0x69, 0x63, 0x73, 0x18, 0x05, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, - 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, - 0x65, 0x2e, 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4e, 0x69, 0x63, 0x73, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6e, 0x69, 0x63, 0x73, 0x1a, 0x63, 0x0a, 0x09, 0x53, 0x63, - 0x73, 0x69, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, - 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, - 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x58, 0x0a, 0x09, 0x4e, 0x69, 0x63, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x35, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, - 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4e, 0x49, 0x43, 0x52, 0x05, - 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x03, 0x4e, 0x49, 0x43, - 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x49, - 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x63, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x61, 0x63, 0x41, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x22, 0xdb, 0x01, 0x0a, 0x0e, 0x53, 0x43, 0x53, 0x49, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x5d, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, - 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, - 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x6a, 0x0a, 0x10, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, - 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x82, 0x03, 0x0a, + 0x0c, 0x53, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x33, 0x0a, + 0x02, 0x76, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x41, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, - 0x22, 0xf7, 0x01, 0x0a, 0x0e, 0x53, 0x43, 0x53, 0x49, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0e, 0x32, 0x39, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, - 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, - 0x43, 0x53, 0x49, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x41, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, - 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x65, 0x61, 0x64, 0x5f, 0x6f, - 0x6e, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, 0x61, 0x64, 0x4f, - 0x6e, 0x6c, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x76, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x76, 0x64, 0x54, 0x79, 0x70, 0x65, 0x22, 0x4a, - 0x0a, 0x0e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x0f, 0x0a, 0x0b, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x10, - 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x61, 0x73, 0x73, 0x54, 0x68, 0x72, 0x75, 0x10, 0x01, 0x12, - 0x19, 0x0a, 0x15, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x56, 0x69, 0x72, - 0x74, 0x75, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x10, 0x02, 0x22, 0xdd, 0x02, 0x0a, 0x08, 0x52, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x45, 0x0a, 0x06, 0x6c, 0x61, 0x79, 0x65, 0x72, - 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, - 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x61, - 0x79, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x06, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x1a, 0x81, - 0x02, 0x0a, 0x06, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, - 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x53, 0x63, 0x72, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, + 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x4d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x02, + 0x76, 0x6d, 0x12, 0x39, 0x0a, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, + 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x47, + 0x43, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x42, 0x0a, + 0x06, 0x69, 0x66, 0x61, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2a, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, + 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x47, 0x75, 0x65, 0x73, 0x74, + 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x52, 0x06, 0x69, 0x66, 0x61, 0x63, 0x65, + 0x73, 0x12, 0x58, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x2e, 0x53, 0x61, 0x6e, 0x64, 0x62, 0x6f, 0x78, 0x53, 0x74, 0x61, 0x74, 0x65, 0x2e, + 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x1a, 0x64, 0x0a, 0x0f, 0x43, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, + 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, + 0x12, 0x3b, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, + 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x43, 0x6f, 0x6e, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0x34, 0x0a, 0x0e, 0x47, 0x75, 0x65, 0x73, 0x74, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x66, + 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x6e, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x26, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x74, 0x61, + 0x69, 0x6e, 0x65, 0x72, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x6e, 0x69, 0x74, 0x5f, 0x70, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x69, 0x6e, 0x69, 0x74, 0x50, 0x69, 0x64, 0x22, + 0xac, 0x01, 0x0a, 0x07, 0x56, 0x4d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x3c, 0x0a, 0x06, 0x63, + 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, + 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, + 0x70, 0x61, 0x74, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, + 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x42, 0x0a, 0x09, 0x72, 0x65, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, + 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x22, 0xab, + 0x03, 0x0a, 0x08, 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x19, 0x0a, 0x08, 0x76, + 0x70, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, + 0x70, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0c, 0x6d, 0x65, 0x6d, 0x5f, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x5f, 0x6d, 0x62, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x6d, 0x65, + 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4d, 0x62, 0x12, 0x1b, 0x0a, 0x09, 0x76, 0x61, 0x5f, 0x62, + 0x61, 0x63, 0x6b, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x76, 0x61, 0x42, + 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x42, 0x0a, 0x04, 0x73, 0x63, 0x73, 0x69, 0x18, 0x04, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, - 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, - 0x2e, 0x53, 0x43, 0x53, 0x49, 0x52, 0x07, 0x53, 0x63, 0x72, 0x61, 0x74, 0x63, 0x68, 0x12, 0x58, - 0x0a, 0x0e, 0x52, 0x65, 0x61, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, - 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, + 0x2e, 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x53, 0x63, 0x73, 0x69, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x63, 0x73, 0x69, 0x12, 0x42, 0x0a, 0x04, 0x6e, 0x69, 0x63, + 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, + 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, + 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x4d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x4e, 0x69, + 0x63, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x6e, 0x69, 0x63, 0x73, 0x1a, 0x63, 0x0a, + 0x09, 0x53, 0x63, 0x73, 0x69, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x40, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, + 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x43, 0x6f, 0x6e, + 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x1a, 0x58, 0x0a, 0x09, 0x4e, 0x69, 0x63, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, + 0x79, 0x12, 0x35, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, + 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x4e, 0x49, + 0x43, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x47, 0x0a, 0x03, + 0x4e, 0x49, 0x43, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x6e, 0x64, 0x70, 0x6f, 0x69, + 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x63, 0x5f, 0x61, 0x64, 0x64, 0x72, + 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x61, 0x63, 0x41, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0xdb, 0x01, 0x0a, 0x0e, 0x53, 0x43, 0x53, 0x49, 0x43, 0x6f, + 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x12, 0x5d, 0x0a, 0x0b, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3b, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, + 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x43, + 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x6a, 0x0a, 0x10, 0x41, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x40, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, + 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x41, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0xf7, 0x01, 0x0a, 0x0e, 0x53, 0x43, 0x53, 0x49, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0e, 0x32, 0x39, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, + 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, + 0x65, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, + 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, + 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x72, 0x65, 0x61, + 0x64, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x72, 0x65, + 0x61, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x76, 0x64, 0x5f, 0x74, 0x79, + 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x65, 0x76, 0x64, 0x54, 0x79, 0x70, + 0x65, 0x22, 0x4a, 0x0a, 0x0e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x44, 0x69, + 0x73, 0x6b, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x61, 0x73, 0x73, 0x54, 0x68, 0x72, 0x75, + 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x73, 0x69, 0x62, 0x6c, 0x65, + 0x56, 0x69, 0x72, 0x74, 0x75, 0x61, 0x6c, 0x44, 0x69, 0x73, 0x6b, 0x10, 0x02, 0x22, 0xdd, 0x02, + 0x0a, 0x08, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x45, 0x0a, 0x06, 0x6c, 0x61, + 0x79, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, + 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x2e, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x48, 0x00, 0x52, 0x06, 0x6c, 0x61, 0x79, 0x65, 0x72, + 0x73, 0x1a, 0x81, 0x02, 0x0a, 0x06, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x12, 0x17, 0x0a, 0x07, + 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x53, 0x63, 0x72, 0x61, 0x74, 0x63, 0x68, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x4c, 0x61, 0x79, - 0x65, 0x72, 0x73, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x52, 0x0e, 0x52, 0x65, 0x61, 0x64, 0x4f, 0x6e, - 0x6c, 0x79, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x1a, 0x38, 0x0a, 0x04, 0x53, 0x43, 0x53, 0x49, - 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, - 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x6c, - 0x75, 0x6e, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x0c, 0x0a, 0x0a, 0x47, 0x75, - 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x58, 0x0a, 0x16, 0x47, 0x75, 0x65, 0x73, - 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, - 0x65, 0x64, 0x12, 0x3e, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, - 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, - 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, - 0x6f, 0x6e, 0x22, 0x55, 0x0a, 0x13, 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x3e, 0x0a, 0x06, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x72, 0x73, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x52, 0x07, 0x53, 0x63, 0x72, 0x61, 0x74, 0x63, + 0x68, 0x12, 0x58, 0x0a, 0x0e, 0x52, 0x65, 0x61, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x4c, 0x61, 0x79, + 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x30, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, - 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x22, 0x69, 0x0a, 0x07, 0x47, 0x43, 0x53, - 0x74, 0x61, 0x74, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, - 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, - 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x52, 0x09, 0x70, 0x72, - 0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, 0x78, 0x74, 0x5f, - 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x6e, 0x65, 0x78, 0x74, - 0x50, 0x6f, 0x72, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, - 0x72, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, - 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x64, 0x69, 0x6e, 0x5f, 0x70, 0x6f, 0x72, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x73, 0x74, 0x64, 0x69, 0x6e, 0x50, 0x6f, 0x72, - 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x50, 0x6f, - 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x5f, 0x70, 0x6f, 0x72, - 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x50, - 0x6f, 0x72, 0x74, 0x22, 0x6b, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x78, 0x65, - 0x63, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x78, 0x65, 0x63, - 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x6c, 0x12, 0x10, - 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x70, 0x69, 0x64, - 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x4d, - 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x2f, 0x68, 0x63, 0x73, 0x73, 0x68, 0x69, 0x6d, - 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x3b, - 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, + 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x2e, 0x53, 0x43, 0x53, 0x49, 0x52, 0x0e, 0x52, 0x65, 0x61, + 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x4c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x1a, 0x38, 0x0a, 0x04, 0x53, + 0x43, 0x53, 0x49, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x6c, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x75, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x03, 0x6c, 0x75, 0x6e, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x0c, 0x0a, + 0x0a, 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x58, 0x0a, 0x16, 0x47, + 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x63, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x3e, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, + 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x2e, 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x06, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x22, 0x55, 0x0a, 0x13, 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x12, 0x3e, 0x0a, 0x06, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, + 0x2e, 0x76, 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x47, 0x75, 0x65, 0x73, 0x74, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x22, 0x69, 0x0a, 0x07, + 0x47, 0x43, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x41, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x63, 0x65, + 0x73, 0x73, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x64, 0x2e, 0x72, 0x75, 0x6e, 0x68, 0x63, 0x73, 0x2e, 0x76, + 0x31, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x52, + 0x09, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x65, + 0x78, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x6e, + 0x65, 0x78, 0x74, 0x50, 0x6f, 0x72, 0x74, 0x22, 0xac, 0x01, 0x0a, 0x07, 0x50, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, + 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x61, + 0x69, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, + 0x73, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x63, + 0x65, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x74, 0x64, 0x69, 0x6e, 0x5f, 0x70, + 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x73, 0x74, 0x64, 0x69, 0x6e, + 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x64, 0x6f, 0x75, 0x74, 0x5f, 0x70, + 0x6f, 0x72, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x74, 0x64, 0x6f, 0x75, + 0x74, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x74, 0x64, 0x65, 0x72, 0x72, 0x5f, + 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x73, 0x74, 0x64, 0x65, + 0x72, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x22, 0x6b, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, + 0x65, 0x78, 0x65, 0x63, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, + 0x78, 0x65, 0x63, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, + 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, + 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, + 0x70, 0x69, 0x64, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x4d, 0x69, 0x63, 0x72, 0x6f, 0x73, 0x6f, 0x66, 0x74, 0x2f, 0x68, 0x63, 0x73, 0x73, + 0x68, 0x69, 0x6d, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x73, 0x74, 0x61, + 0x74, 0x65, 0x3b, 0x73, 0x74, 0x61, 0x74, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1198,56 +1338,62 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDescGZIP() } var file_github_com_Microsoft_hcsshim_internal_state_state_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes = make([]protoimpl.MessageInfo, 20) +var file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_github_com_Microsoft_hcsshim_internal_state_state_proto_goTypes = []interface{}{ (SCSIAttachment_AttachmentType)(0), // 0: containerd.runhcs.v1.state.SCSIAttachment.AttachmentType (*TaskServerState)(nil), // 1: containerd.runhcs.v1.state.TaskServerState (*SandboxState)(nil), // 2: containerd.runhcs.v1.state.SandboxState - (*VMState)(nil), // 3: containerd.runhcs.v1.state.VMState - (*VMConfig)(nil), // 4: containerd.runhcs.v1.state.VMConfig - (*NIC)(nil), // 5: containerd.runhcs.v1.state.NIC - (*SCSIController)(nil), // 6: containerd.runhcs.v1.state.SCSIController - (*SCSIAttachment)(nil), // 7: containerd.runhcs.v1.state.SCSIAttachment - (*Resource)(nil), // 8: containerd.runhcs.v1.state.Resource - (*GuestState)(nil), // 9: containerd.runhcs.v1.state.GuestState - (*GuestStateDisconnected)(nil), // 10: containerd.runhcs.v1.state.GuestStateDisconnected - (*GuestStateConnected)(nil), // 11: containerd.runhcs.v1.state.GuestStateConnected - (*GCState)(nil), // 12: containerd.runhcs.v1.state.GCState - (*Process)(nil), // 13: containerd.runhcs.v1.state.Process - (*TaskState)(nil), // 14: containerd.runhcs.v1.state.TaskState - nil, // 15: containerd.runhcs.v1.state.TaskServerState.TasksEntry - nil, // 16: containerd.runhcs.v1.state.VMConfig.ScsiEntry - nil, // 17: containerd.runhcs.v1.state.VMConfig.NicsEntry - nil, // 18: containerd.runhcs.v1.state.SCSIController.AttachmentsEntry - (*Resource_Layers)(nil), // 19: containerd.runhcs.v1.state.Resource.Layers - (*Resource_Layers_SCSI)(nil), // 20: containerd.runhcs.v1.state.Resource.Layers.SCSI + (*GuestInterface)(nil), // 3: containerd.runhcs.v1.state.GuestInterface + (*Container)(nil), // 4: containerd.runhcs.v1.state.Container + (*VMState)(nil), // 5: containerd.runhcs.v1.state.VMState + (*VMConfig)(nil), // 6: containerd.runhcs.v1.state.VMConfig + (*NIC)(nil), // 7: containerd.runhcs.v1.state.NIC + (*SCSIController)(nil), // 8: containerd.runhcs.v1.state.SCSIController + (*SCSIAttachment)(nil), // 9: containerd.runhcs.v1.state.SCSIAttachment + (*Resource)(nil), // 10: containerd.runhcs.v1.state.Resource + (*GuestState)(nil), // 11: containerd.runhcs.v1.state.GuestState + (*GuestStateDisconnected)(nil), // 12: containerd.runhcs.v1.state.GuestStateDisconnected + (*GuestStateConnected)(nil), // 13: containerd.runhcs.v1.state.GuestStateConnected + (*GCState)(nil), // 14: containerd.runhcs.v1.state.GCState + (*Process)(nil), // 15: containerd.runhcs.v1.state.Process + (*TaskState)(nil), // 16: containerd.runhcs.v1.state.TaskState + nil, // 17: containerd.runhcs.v1.state.TaskServerState.TasksEntry + nil, // 18: containerd.runhcs.v1.state.SandboxState.ContainersEntry + nil, // 19: containerd.runhcs.v1.state.VMConfig.ScsiEntry + nil, // 20: containerd.runhcs.v1.state.VMConfig.NicsEntry + nil, // 21: containerd.runhcs.v1.state.SCSIController.AttachmentsEntry + (*Resource_Layers)(nil), // 22: containerd.runhcs.v1.state.Resource.Layers + (*Resource_Layers_SCSI)(nil), // 23: containerd.runhcs.v1.state.Resource.Layers.SCSI } var file_github_com_Microsoft_hcsshim_internal_state_state_proto_depIdxs = []int32{ 2, // 0: containerd.runhcs.v1.state.TaskServerState.sandbox:type_name -> containerd.runhcs.v1.state.SandboxState - 15, // 1: containerd.runhcs.v1.state.TaskServerState.tasks:type_name -> containerd.runhcs.v1.state.TaskServerState.TasksEntry - 3, // 2: containerd.runhcs.v1.state.SandboxState.vm:type_name -> containerd.runhcs.v1.state.VMState - 12, // 3: containerd.runhcs.v1.state.SandboxState.agent:type_name -> containerd.runhcs.v1.state.GCState - 4, // 4: containerd.runhcs.v1.state.VMState.config:type_name -> containerd.runhcs.v1.state.VMConfig - 8, // 5: containerd.runhcs.v1.state.VMState.resources:type_name -> containerd.runhcs.v1.state.Resource - 16, // 6: containerd.runhcs.v1.state.VMConfig.scsi:type_name -> containerd.runhcs.v1.state.VMConfig.ScsiEntry - 17, // 7: containerd.runhcs.v1.state.VMConfig.nics:type_name -> containerd.runhcs.v1.state.VMConfig.NicsEntry - 18, // 8: containerd.runhcs.v1.state.SCSIController.attachments:type_name -> containerd.runhcs.v1.state.SCSIController.AttachmentsEntry - 0, // 9: containerd.runhcs.v1.state.SCSIAttachment.type:type_name -> containerd.runhcs.v1.state.SCSIAttachment.AttachmentType - 19, // 10: containerd.runhcs.v1.state.Resource.layers:type_name -> containerd.runhcs.v1.state.Resource.Layers - 9, // 11: containerd.runhcs.v1.state.GuestStateDisconnected.common:type_name -> containerd.runhcs.v1.state.GuestState - 9, // 12: containerd.runhcs.v1.state.GuestStateConnected.common:type_name -> containerd.runhcs.v1.state.GuestState - 13, // 13: containerd.runhcs.v1.state.GCState.processes:type_name -> containerd.runhcs.v1.state.Process - 14, // 14: containerd.runhcs.v1.state.TaskServerState.TasksEntry.value:type_name -> containerd.runhcs.v1.state.TaskState - 6, // 15: containerd.runhcs.v1.state.VMConfig.ScsiEntry.value:type_name -> containerd.runhcs.v1.state.SCSIController - 5, // 16: containerd.runhcs.v1.state.VMConfig.NicsEntry.value:type_name -> containerd.runhcs.v1.state.NIC - 7, // 17: containerd.runhcs.v1.state.SCSIController.AttachmentsEntry.value:type_name -> containerd.runhcs.v1.state.SCSIAttachment - 20, // 18: containerd.runhcs.v1.state.Resource.Layers.Scratch:type_name -> containerd.runhcs.v1.state.Resource.Layers.SCSI - 20, // 19: containerd.runhcs.v1.state.Resource.Layers.ReadOnlyLayers:type_name -> containerd.runhcs.v1.state.Resource.Layers.SCSI - 20, // [20:20] is the sub-list for method output_type - 20, // [20:20] is the sub-list for method input_type - 20, // [20:20] is the sub-list for extension type_name - 20, // [20:20] is the sub-list for extension extendee - 0, // [0:20] is the sub-list for field type_name + 17, // 1: containerd.runhcs.v1.state.TaskServerState.tasks:type_name -> containerd.runhcs.v1.state.TaskServerState.TasksEntry + 5, // 2: containerd.runhcs.v1.state.SandboxState.vm:type_name -> containerd.runhcs.v1.state.VMState + 14, // 3: containerd.runhcs.v1.state.SandboxState.agent:type_name -> containerd.runhcs.v1.state.GCState + 3, // 4: containerd.runhcs.v1.state.SandboxState.ifaces:type_name -> containerd.runhcs.v1.state.GuestInterface + 18, // 5: containerd.runhcs.v1.state.SandboxState.containers:type_name -> containerd.runhcs.v1.state.SandboxState.ContainersEntry + 6, // 6: containerd.runhcs.v1.state.VMState.config:type_name -> containerd.runhcs.v1.state.VMConfig + 10, // 7: containerd.runhcs.v1.state.VMState.resources:type_name -> containerd.runhcs.v1.state.Resource + 19, // 8: containerd.runhcs.v1.state.VMConfig.scsi:type_name -> containerd.runhcs.v1.state.VMConfig.ScsiEntry + 20, // 9: containerd.runhcs.v1.state.VMConfig.nics:type_name -> containerd.runhcs.v1.state.VMConfig.NicsEntry + 21, // 10: containerd.runhcs.v1.state.SCSIController.attachments:type_name -> containerd.runhcs.v1.state.SCSIController.AttachmentsEntry + 0, // 11: containerd.runhcs.v1.state.SCSIAttachment.type:type_name -> containerd.runhcs.v1.state.SCSIAttachment.AttachmentType + 22, // 12: containerd.runhcs.v1.state.Resource.layers:type_name -> containerd.runhcs.v1.state.Resource.Layers + 11, // 13: containerd.runhcs.v1.state.GuestStateDisconnected.common:type_name -> containerd.runhcs.v1.state.GuestState + 11, // 14: containerd.runhcs.v1.state.GuestStateConnected.common:type_name -> containerd.runhcs.v1.state.GuestState + 15, // 15: containerd.runhcs.v1.state.GCState.processes:type_name -> containerd.runhcs.v1.state.Process + 16, // 16: containerd.runhcs.v1.state.TaskServerState.TasksEntry.value:type_name -> containerd.runhcs.v1.state.TaskState + 4, // 17: containerd.runhcs.v1.state.SandboxState.ContainersEntry.value:type_name -> containerd.runhcs.v1.state.Container + 8, // 18: containerd.runhcs.v1.state.VMConfig.ScsiEntry.value:type_name -> containerd.runhcs.v1.state.SCSIController + 7, // 19: containerd.runhcs.v1.state.VMConfig.NicsEntry.value:type_name -> containerd.runhcs.v1.state.NIC + 9, // 20: containerd.runhcs.v1.state.SCSIController.AttachmentsEntry.value:type_name -> containerd.runhcs.v1.state.SCSIAttachment + 23, // 21: containerd.runhcs.v1.state.Resource.Layers.Scratch:type_name -> containerd.runhcs.v1.state.Resource.Layers.SCSI + 23, // 22: containerd.runhcs.v1.state.Resource.Layers.ReadOnlyLayers:type_name -> containerd.runhcs.v1.state.Resource.Layers.SCSI + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name } func init() { file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() } @@ -1281,7 +1427,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VMState); i { + switch v := v.(*GuestInterface); i { case 0: return &v.state case 1: @@ -1293,7 +1439,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*VMConfig); i { + switch v := v.(*Container); i { case 0: return &v.state case 1: @@ -1305,7 +1451,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*NIC); i { + switch v := v.(*VMState); i { case 0: return &v.state case 1: @@ -1317,7 +1463,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SCSIController); i { + switch v := v.(*VMConfig); i { case 0: return &v.state case 1: @@ -1329,7 +1475,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SCSIAttachment); i { + switch v := v.(*NIC); i { case 0: return &v.state case 1: @@ -1341,7 +1487,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Resource); i { + switch v := v.(*SCSIController); i { case 0: return &v.state case 1: @@ -1353,7 +1499,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GuestState); i { + switch v := v.(*SCSIAttachment); i { case 0: return &v.state case 1: @@ -1365,7 +1511,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GuestStateDisconnected); i { + switch v := v.(*Resource); i { case 0: return &v.state case 1: @@ -1377,7 +1523,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GuestStateConnected); i { + switch v := v.(*GuestState); i { case 0: return &v.state case 1: @@ -1389,7 +1535,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GCState); i { + switch v := v.(*GuestStateDisconnected); i { case 0: return &v.state case 1: @@ -1401,7 +1547,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*Process); i { + switch v := v.(*GuestStateConnected); i { case 0: return &v.state case 1: @@ -1413,6 +1559,30 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GCState); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Process); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*TaskState); i { case 0: return &v.state @@ -1424,7 +1594,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { return nil } } - file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Layers); i { case 0: return &v.state @@ -1436,7 +1606,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { return nil } } - file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Resource_Layers_SCSI); i { case 0: return &v.state @@ -1449,7 +1619,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { } } } - file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[7].OneofWrappers = []interface{}{ + file_github_com_Microsoft_hcsshim_internal_state_state_proto_msgTypes[9].OneofWrappers = []interface{}{ (*Resource_Layers_)(nil), } type x struct{} @@ -1458,7 +1628,7 @@ func file_github_com_Microsoft_hcsshim_internal_state_state_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_github_com_Microsoft_hcsshim_internal_state_state_proto_rawDesc, NumEnums: 1, - NumMessages: 20, + NumMessages: 23, NumExtensions: 0, NumServices: 0, }, diff --git a/internal/state/state.proto b/internal/state/state.proto index bdc8a75a8b..2b9d9c8cb1 100644 --- a/internal/state/state.proto +++ b/internal/state/state.proto @@ -12,9 +12,15 @@ message TaskServerState { message SandboxState { VMState vm = 1; GCState agent = 2; + repeated GuestInterface ifaces = 4; map containers = 3; } +message GuestInterface { + string nsid = 1; + string id = 2; +} + message Container { uint32 init_pid = 1; } diff --git a/internal/taskserver/migration.go b/internal/taskserver/migration.go index 372f963c9a..232a459c62 100644 --- a/internal/taskserver/migration.go +++ b/internal/taskserver/migration.go @@ -79,7 +79,7 @@ func (s *service) newSandboxLM(ctx context.Context, shimOpts *runhcsopts.Options if !ok { return fmt.Errorf("expected TaskServerState, got %T instead", configRaw) } - sandbox, err := linuxvm.NewLMSandbox(ctx, req.ID, config.Sandbox, spec.Annotations) + sandbox, err := linuxvm.NewLMSandbox(ctx, req.ID, config.Sandbox, spec.Netns, spec.Annotations) if err != nil { return err } @@ -149,12 +149,7 @@ func (s *service) TransferSandbox(ctx context.Context, req *lmproto.TransferSand if s.migState.c == 0 { return fmt.Errorf("must set up channel before transferring") } - logrus.WithFields(logrus.Fields{ - "hasMigState": s.migState != nil, - "hasSandbox": s.migState != nil && s.migState.sandbox != nil, - }).Info("starting LM transfer") if err := s.migState.sandbox.LMTransfer(ctx, uintptr(s.migState.c)); err != nil { - logrus.WithError(err).Error("LM transfer failed") if err := stream.Send(&lmproto.TransferSandboxResponse{ MessageId: 1, Status: lmproto.TransferSandboxResponse_STATUS_FAILED,