From 688302c71d43e50cbfaa5ce8490854172eeb7b9b Mon Sep 17 00:00:00 2001 From: robertdavidsmith <34475852+robertdavidsmith@users.noreply.github.com> Date: Thu, 1 Aug 2024 10:48:47 +0100 Subject: [PATCH] Scheduler: NodeType does not need to be proto-generated (#3840) Signed-off-by: Robert Smith --- .../node_type.go} | 75 +- .../scheduler/internaltypes/node_type_test.go | 92 ++ internal/scheduler/nodedb/nodedb.go | 20 +- .../scheduler/nodedb/nodeiteration_test.go | 4 +- internal/scheduler/nodedb/nodematching.go | 26 +- .../scheduler/nodedb/nodematching_test.go | 2 +- .../schedulerobjects/schedulerobjects.pb.go | 813 +++--------------- .../schedulerobjects/schedulerobjects.proto | 20 - 8 files changed, 298 insertions(+), 754 deletions(-) rename internal/scheduler/{schedulerobjects/nodetype.go => internaltypes/node_type.go} (67%) create mode 100644 internal/scheduler/internaltypes/node_type_test.go diff --git a/internal/scheduler/schedulerobjects/nodetype.go b/internal/scheduler/internaltypes/node_type.go similarity index 67% rename from internal/scheduler/schedulerobjects/nodetype.go rename to internal/scheduler/internaltypes/node_type.go index 020c57e675d..393cb8a8305 100644 --- a/internal/scheduler/schedulerobjects/nodetype.go +++ b/internal/scheduler/internaltypes/node_type.go @@ -1,12 +1,65 @@ -package schedulerobjects +package internaltypes import ( "github.com/segmentio/fasthash/fnv1a" "golang.org/x/exp/maps" "golang.org/x/exp/slices" v1 "k8s.io/api/core/v1" + + koTaint "github.com/armadaproject/armada/internal/scheduler/kubernetesobjects/taint" ) +// NodeType represents a particular combination of taints and labels. +// The scheduler groups nodes by node type. When assigning pods to nodes, +// the scheduler only considers nodes with a NodeType for which the taints and labels match. +// Its fields should be immutable! Do not change these! +type NodeType struct { + // Unique identifier. Used for map lookup. + id uint64 + // Kubernetes taints. + // To reduce the number of distinct node types, + // may contain only a subset of the taints of the node the node type is created from. + taints []v1.Taint + // Kubernetes labels. + // To reduce the number of distinct node types, + // may contain only a subset of the labels of the node the node type is created from. + labels map[string]string + // Well-known labels not set by this node type. + // Used to filter out nodes when looking for nodes for a pod + // that requires at least one well-known label to be set. + unsetIndexedLabels map[string]string +} + +func (m *NodeType) GetId() uint64 { + return m.id +} + +func (m *NodeType) GetTaints() []v1.Taint { + return koTaint.DeepCopyTaints(m.taints) +} + +func (m *NodeType) FindMatchingUntoleratedTaint(tolerations ...[]v1.Toleration) (v1.Taint, bool) { + return koTaint.FindMatchingUntoleratedTaint(m.taints, tolerations...) +} + +func (m *NodeType) GetLabels() map[string]string { + return deepCopyLabels(m.labels) +} + +func (m *NodeType) GetLabelValue(key string) (string, bool) { + val, ok := m.labels[key] + return val, ok +} + +func (m *NodeType) GetUnsetIndexedLabels() map[string]string { + return deepCopyLabels(m.unsetIndexedLabels) +} + +func (m *NodeType) GetUnsetIndexedLabelValue(key string) (string, bool) { + val, ok := m.unsetIndexedLabels[key] + return val, ok +} + type ( taintsFilterFunc func(*v1.Taint) bool labelsFilterFunc func(key, value string) bool @@ -63,10 +116,10 @@ func NewNodeType(taints []v1.Taint, labels map[string]string, indexedTaints map[ } return &NodeType{ - Id: nodeTypeIdFromTaintsAndLabels(taints, labels, unsetIndexedLabels), - Taints: taints, - Labels: labels, - UnsetIndexedLabels: unsetIndexedLabels, + id: nodeTypeIdFromTaintsAndLabels(taints, labels, unsetIndexedLabels), + taints: taints, + labels: labels, + unsetIndexedLabels: unsetIndexedLabels, } } @@ -139,15 +192,3 @@ func getFilteredLabels(labels map[string]string, inclusionFilter labelsFilterFun } return filteredLabels } - -func (nodeType *NodeType) DeepCopy() *NodeType { - if nodeType == nil { - return nil - } - return &NodeType{ - Id: nodeType.Id, - Taints: slices.Clone(nodeType.Taints), - Labels: maps.Clone(nodeType.Labels), - UnsetIndexedLabels: maps.Clone(nodeType.UnsetIndexedLabels), - } -} diff --git a/internal/scheduler/internaltypes/node_type_test.go b/internal/scheduler/internaltypes/node_type_test.go new file mode 100644 index 00000000000..146cca262f8 --- /dev/null +++ b/internal/scheduler/internaltypes/node_type_test.go @@ -0,0 +1,92 @@ +package internaltypes + +import ( + "testing" + + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" +) + +func TestNodeType_GetId(t *testing.T) { + nodeType := makeSut() + + assert.True(t, nodeType.GetId() != 0) +} + +func TestNodeType_GetTaints(t *testing.T) { + nodeType := makeSut() + + assert.Equal(t, + []v1.Taint{ + {Key: "taint1", Value: "value1", Effect: v1.TaintEffectNoSchedule}, + {Key: "taint2", Value: "value2", Effect: v1.TaintEffectNoSchedule}, + }, + nodeType.GetTaints(), + ) +} + +func TestNodeType_FindMatchingUntoleratedTaint(t *testing.T) { + nodeType := makeSut() + taint, ok := nodeType.FindMatchingUntoleratedTaint([]v1.Toleration{{Key: "taint1", Operator: v1.TolerationOpExists, Effect: v1.TaintEffectNoSchedule}}) + + assert.True(t, ok) + assert.Equal(t, + v1.Taint{Key: "taint2", Value: "value2", Effect: v1.TaintEffectNoSchedule}, + taint) +} + +func TestNodeTypeLabels(t *testing.T) { + nodeType := makeSut() + + assert.Equal(t, + map[string]string{ + "label1": "value1", + "label2": "value2", + }, + nodeType.GetLabels(), + ) + + val1, ok1 := nodeType.GetLabelValue("label1") + assert.Equal(t, val1, "value1") + assert.True(t, ok1) + + val2, ok2 := nodeType.GetLabelValue("not-there") + assert.Equal(t, val2, "") + assert.False(t, ok2) + + assert.Equal(t, + map[string]string{ + "label3": "", + }, + nodeType.GetUnsetIndexedLabels(), + ) + + val3, ok3 := nodeType.GetUnsetIndexedLabelValue("label3") + assert.Equal(t, val3, "") + assert.True(t, ok3) + + val4, ok4 := nodeType.GetUnsetIndexedLabelValue("not-there") + assert.Equal(t, val4, "") + assert.False(t, ok4) +} + +func makeSut() *NodeType { + taints := []v1.Taint{ + {Key: "taint1", Value: "value1", Effect: v1.TaintEffectNoSchedule}, + {Key: "not-indexed-taint", Value: "not-indexed-taint-value", Effect: v1.TaintEffectNoSchedule}, + {Key: "taint2", Value: "value2", Effect: v1.TaintEffectNoSchedule}, + } + + labels := map[string]string{ + "label1": "value1", + "label2": "value2", + "not-indexed-label;": "not-indexed-label-value", + } + + return NewNodeType( + taints, + labels, + map[string]interface{}{"taint1": true, "taint2": true, "taint3": true}, + map[string]interface{}{"label1": true, "label2": true, "label3": true}, + ) +} diff --git a/internal/scheduler/nodedb/nodedb.go b/internal/scheduler/nodedb/nodedb.go index 4c6c5b8a8a9..d0d8a9b90d3 100644 --- a/internal/scheduler/nodedb/nodedb.go +++ b/internal/scheduler/nodedb/nodedb.go @@ -49,7 +49,7 @@ func (nodeDb *NodeDb) create(node *schedulerobjects.Node) (*internaltypes.Node, totalResources := node.TotalResources - nodeType := schedulerobjects.NewNodeType( + nodeType := internaltypes.NewNodeType( taints, labels, nodeDb.indexedTaints, @@ -77,14 +77,14 @@ func (nodeDb *NodeDb) create(node *schedulerobjects.Node) (*internaltypes.Node, } index := uint64(nodeDb.numNodes) nodeDb.numNodes++ - nodeDb.numNodesByNodeType[nodeType.Id]++ + nodeDb.numNodesByNodeType[nodeType.GetId()]++ nodeDb.totalResources.Add(totalResources) - nodeDb.nodeTypes[nodeType.Id] = nodeType + nodeDb.nodeTypes[nodeType.GetId()] = nodeType nodeDb.mu.Unlock() return internaltypes.CreateNode( node.Id, - nodeType.Id, + nodeType.GetId(), index, node.Executor, node.Name, @@ -193,7 +193,7 @@ type NodeDb struct { totalResources schedulerobjects.ResourceList // Set of node types. Populated automatically as nodes are inserted. // Node types are not cleaned up if all nodes of that type are removed from the NodeDb. - nodeTypes map[uint64]*schedulerobjects.NodeType + nodeTypes map[uint64]*internaltypes.NodeType wellKnownNodeTypes map[string]*configuration.WellKnownNodeType @@ -267,7 +267,7 @@ func NewNodeDb( indexedTaints: mapFromSlice(indexedTaints), indexedNodeLabels: mapFromSlice(indexedNodeLabels), indexedNodeLabelValues: indexedNodeLabelValues, - nodeTypes: make(map[uint64]*schedulerobjects.NodeType), + nodeTypes: make(map[uint64]*internaltypes.NodeType), wellKnownNodeTypes: make(map[string]*configuration.WellKnownNodeType), numNodesByNodeType: make(map[uint64]int), totalResources: schedulerobjects.ResourceList{Resources: make(map[string]resource.Quantity)}, @@ -353,7 +353,7 @@ func (nodeDb *NodeDb) String() string { } else { fmt.Fprint(w, "Node types:\n") for _, nodeType := range nodeDb.nodeTypes { - fmt.Fprintf(w, " %d\n", nodeType.Id) + fmt.Fprintf(w, " %d\n", nodeType.GetId()) } } w.Flush() @@ -1069,12 +1069,12 @@ func (nodeDb *NodeDb) NodeTypesMatchingJob(jctx *schedulercontext.JobSchedulingC for _, nodeType := range nodeDb.nodeTypes { matches, reason := NodeTypeJobRequirementsMet(nodeType, jctx) if matches { - matchingNodeTypeIds = append(matchingNodeTypeIds, nodeType.Id) + matchingNodeTypeIds = append(matchingNodeTypeIds, nodeType.GetId()) } else if reason != nil { s := nodeDb.stringFromPodRequirementsNotMetReason(reason) - numExcludedNodesByReason[s] += nodeDb.numNodesByNodeType[nodeType.Id] + numExcludedNodesByReason[s] += nodeDb.numNodesByNodeType[nodeType.GetId()] } else { - numExcludedNodesByReason[PodRequirementsNotMetReasonUnknown] += nodeDb.numNodesByNodeType[nodeType.Id] + numExcludedNodesByReason[PodRequirementsNotMetReasonUnknown] += nodeDb.numNodesByNodeType[nodeType.GetId()] } } return matchingNodeTypeIds, numExcludedNodesByReason, nil diff --git a/internal/scheduler/nodedb/nodeiteration_test.go b/internal/scheduler/nodedb/nodeiteration_test.go index 1b93e32f561..2355a81b563 100644 --- a/internal/scheduler/nodedb/nodeiteration_test.go +++ b/internal/scheduler/nodedb/nodeiteration_test.go @@ -957,11 +957,11 @@ func gpuNodeTypeLabelToNodeTypeId(nodeTypeLabel string) uint64 { } func labelsToNodeTypeId(labels map[string]string) uint64 { - nodeType := schedulerobjects.NewNodeType( + nodeType := internaltypes.NewNodeType( []v1.Taint{}, labels, mapFromSlice(testfixtures.TestIndexedTaints), mapFromSlice(testfixtures.TestIndexedNodeLabels), ) - return nodeType.Id + return nodeType.GetId() } diff --git a/internal/scheduler/nodedb/nodematching.go b/internal/scheduler/nodedb/nodematching.go index eec678ec3c5..d877b524342 100644 --- a/internal/scheduler/nodedb/nodematching.go +++ b/internal/scheduler/nodedb/nodematching.go @@ -9,8 +9,6 @@ import ( schedulercontext "github.com/armadaproject/armada/internal/scheduler/context" "github.com/armadaproject/armada/internal/scheduler/internaltypes" - koTaint "github.com/armadaproject/armada/internal/scheduler/kubernetesobjects/taint" - "github.com/armadaproject/armada/internal/scheduler/schedulerobjects" ) const ( @@ -126,24 +124,18 @@ func (err *InsufficientResources) String() string { // NodeTypeJobRequirementsMet determines whether a pod can be scheduled on nodes of this NodeType. // If the requirements are not met, it returns the reason for why. // If the requirements can't be parsed, an error is returned. -func NodeTypeJobRequirementsMet(nodeType *schedulerobjects.NodeType, jctx *schedulercontext.JobSchedulingContext) (bool, PodRequirementsNotMetReason) { - matches, reason := TolerationRequirementsMet(nodeType.GetTaints(), jctx.AdditionalTolerations, jctx.PodRequirements.GetTolerations()) +func NodeTypeJobRequirementsMet(nodeType *internaltypes.NodeType, jctx *schedulercontext.JobSchedulingContext) (bool, PodRequirementsNotMetReason) { + matches, reason := TolerationRequirementsMet(nodeType, jctx.AdditionalTolerations, jctx.PodRequirements.GetTolerations()) if !matches { return matches, reason } - nodeTypeLabels := nodeType.GetLabels() - nodeTypeLabelGetter := func(key string) (string, bool) { - val, ok := nodeTypeLabels[key] - return val, ok - } - - matches, reason = NodeSelectorRequirementsMet(nodeTypeLabelGetter, nodeType.GetUnsetIndexedLabels(), jctx.AdditionalNodeSelectors) + matches, reason = NodeSelectorRequirementsMet(nodeType.GetLabelValue, nodeType.GetUnsetIndexedLabelValue, jctx.AdditionalNodeSelectors) if !matches { return matches, reason } - return NodeSelectorRequirementsMet(nodeTypeLabelGetter, nodeType.GetUnsetIndexedLabels(), jctx.PodRequirements.GetNodeSelector()) + return NodeSelectorRequirementsMet(nodeType.GetLabelValue, nodeType.GetUnsetIndexedLabelValue, jctx.PodRequirements.GetNodeSelector()) } // JobRequirementsMet determines whether a job can be scheduled onto this node. @@ -202,8 +194,8 @@ func DynamicJobRequirementsMet(allocatableResources internaltypes.ResourceList, return matches, reason } -func TolerationRequirementsMet(taints []v1.Taint, tolerations ...[]v1.Toleration) (bool, PodRequirementsNotMetReason) { - untoleratedTaint, hasUntoleratedTaint := koTaint.FindMatchingUntoleratedTaint(taints, tolerations...) +func TolerationRequirementsMet(nodeType *internaltypes.NodeType, tolerations ...[]v1.Toleration) (bool, PodRequirementsNotMetReason) { + untoleratedTaint, hasUntoleratedTaint := nodeType.FindMatchingUntoleratedTaint(tolerations...) if hasUntoleratedTaint { return false, &UntoleratedTaint{Taint: untoleratedTaint} } @@ -218,7 +210,7 @@ func NodeTolerationRequirementsMet(node *internaltypes.Node, tolerations ...[]v1 return true, nil } -func NodeSelectorRequirementsMet(nodeLabelGetter func(string) (string, bool), unsetIndexedLabels, nodeSelector map[string]string) (bool, PodRequirementsNotMetReason) { +func NodeSelectorRequirementsMet(nodeLabelGetter func(string) (string, bool), unsetIndexedLabelGetter func(string) (string, bool), nodeSelector map[string]string) (bool, PodRequirementsNotMetReason) { for label, podValue := range nodeSelector { // If the label value differs between nodeLabels and the pod, always return false. if nodeValue, ok := nodeLabelGetter(label); ok { @@ -233,8 +225,8 @@ func NodeSelectorRequirementsMet(nodeLabelGetter func(string) (string, bool), un // If unsetIndexedLabels is provided, return false only if this label is explicitly marked as not set. // // If unsetIndexedLabels is not provided, we assume that nodeLabels contains all labels and return false. - if unsetIndexedLabels != nil { - if _, ok := unsetIndexedLabels[label]; ok { + if unsetIndexedLabelGetter != nil { + if _, ok := unsetIndexedLabelGetter(label); ok { return false, &MissingLabel{Label: label} } } else { diff --git a/internal/scheduler/nodedb/nodematching_test.go b/internal/scheduler/nodedb/nodematching_test.go index b70bafd417f..55c8237a2b2 100644 --- a/internal/scheduler/nodedb/nodematching_test.go +++ b/internal/scheduler/nodedb/nodematching_test.go @@ -528,7 +528,7 @@ func TestNodeTypeSchedulingRequirementsMet(t *testing.T) { } for name, tc := range tests { t.Run(name, func(t *testing.T) { - nodeType := schedulerobjects.NewNodeType( + nodeType := internaltypes.NewNodeType( tc.Taints, tc.Labels, tc.IndexedTaints, diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go index 34b1747edf6..88f50b14340 100644 --- a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go +++ b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go @@ -314,87 +314,6 @@ func (m *Node) GetPool() string { return "" } -// NodeType represents a particular combination of taints and labels. -// The scheduler groups nodes by node type. When assigning pods to nodes, -// the scheduler only considers nodes with a NodeType for which the taints and labels match. -type NodeType struct { - // Unique identifier. Used for map lookup. - Id uint64 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` - // Kubernetes taints. - // To reduce the number of distinct node types, - // may contain only a subset of the taints of the node the node type is created from. - Taints []v1.Taint `protobuf:"bytes,2,rep,name=taints,proto3" json:"taints"` - // Kubernetes labels. - // To reduce the number of distinct node types, - // may contain only a subset of the labels of the node the node type is created from. - Labels map[string]string `protobuf:"bytes,3,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` - // Well-known labels not set by this node type. - // Used to filter out nodes when looking for nodes for a pod - // that requires at least one well-known label to be set. - UnsetIndexedLabels map[string]string `protobuf:"bytes,4,rep,name=unsetIndexedLabels,proto3" json:"unsetIndexedLabels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` -} - -func (m *NodeType) Reset() { *m = NodeType{} } -func (m *NodeType) String() string { return proto.CompactTextString(m) } -func (*NodeType) ProtoMessage() {} -func (*NodeType) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{2} -} -func (m *NodeType) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *NodeType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_NodeType.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 *NodeType) XXX_Merge(src proto.Message) { - xxx_messageInfo_NodeType.Merge(m, src) -} -func (m *NodeType) XXX_Size() int { - return m.Size() -} -func (m *NodeType) XXX_DiscardUnknown() { - xxx_messageInfo_NodeType.DiscardUnknown(m) -} - -var xxx_messageInfo_NodeType proto.InternalMessageInfo - -func (m *NodeType) GetId() uint64 { - if m != nil { - return m.Id - } - return 0 -} - -func (m *NodeType) GetTaints() []v1.Taint { - if m != nil { - return m.Taints - } - return nil -} - -func (m *NodeType) GetLabels() map[string]string { - if m != nil { - return m.Labels - } - return nil -} - -func (m *NodeType) GetUnsetIndexedLabels() map[string]string { - if m != nil { - return m.UnsetIndexedLabels - } - return nil -} - // Captures the resource usage of a particular queue in a given cluster. type QueueClusterResourceUsage struct { Created time.Time `protobuf:"bytes,1,opt,name=created,proto3,stdtime" json:"created"` @@ -408,7 +327,7 @@ func (m *QueueClusterResourceUsage) Reset() { *m = QueueClusterResourceU func (m *QueueClusterResourceUsage) String() string { return proto.CompactTextString(m) } func (*QueueClusterResourceUsage) ProtoMessage() {} func (*QueueClusterResourceUsage) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{3} + return fileDescriptor_97dadc5fbd620721, []int{2} } func (m *QueueClusterResourceUsage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -485,7 +404,7 @@ func (m *ClusterResourceUsageReport) Reset() { *m = ClusterResourceUsage func (m *ClusterResourceUsageReport) String() string { return proto.CompactTextString(m) } func (*ClusterResourceUsageReport) ProtoMessage() {} func (*ClusterResourceUsageReport) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{4} + return fileDescriptor_97dadc5fbd620721, []int{3} } func (m *ClusterResourceUsageReport) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -543,7 +462,7 @@ func (m *ResourceList) Reset() { *m = ResourceList{} } func (m *ResourceList) String() string { return proto.CompactTextString(m) } func (*ResourceList) ProtoMessage() {} func (*ResourceList) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{5} + return fileDescriptor_97dadc5fbd620721, []int{4} } func (m *ResourceList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -598,7 +517,7 @@ func (m *JobSchedulingInfo) Reset() { *m = JobSchedulingInfo{} } func (m *JobSchedulingInfo) String() string { return proto.CompactTextString(m) } func (*JobSchedulingInfo) ProtoMessage() {} func (*JobSchedulingInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{6} + return fileDescriptor_97dadc5fbd620721, []int{5} } func (m *JobSchedulingInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -697,7 +616,7 @@ func (m *ObjectRequirements) Reset() { *m = ObjectRequirements{} } func (m *ObjectRequirements) String() string { return proto.CompactTextString(m) } func (*ObjectRequirements) ProtoMessage() {} func (*ObjectRequirements) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{7} + return fileDescriptor_97dadc5fbd620721, []int{6} } func (m *ObjectRequirements) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -780,7 +699,7 @@ func (m *PodRequirements) Reset() { *m = PodRequirements{} } func (m *PodRequirements) String() string { return proto.CompactTextString(m) } func (*PodRequirements) ProtoMessage() {} func (*PodRequirements) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{8} + return fileDescriptor_97dadc5fbd620721, []int{7} } func (m *PodRequirements) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -863,7 +782,7 @@ func (m *PulsarSchedulerJobDetails) Reset() { *m = PulsarSchedulerJobDet func (m *PulsarSchedulerJobDetails) String() string { return proto.CompactTextString(m) } func (*PulsarSchedulerJobDetails) ProtoMessage() {} func (*PulsarSchedulerJobDetails) Descriptor() ([]byte, []int) { - return fileDescriptor_97dadc5fbd620721, []int{9} + return fileDescriptor_97dadc5fbd620721, []int{8} } func (m *PulsarSchedulerJobDetails) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -922,9 +841,6 @@ func init() { proto.RegisterMapType((map[int32]ResourceList)(nil), "schedulerobjects.Node.NonArmadaAllocatedResourcesEntry") proto.RegisterMapType((map[string]*ResourceList)(nil), "schedulerobjects.Node.ResourceUsageByQueueEntry") proto.RegisterMapType((map[string]JobRunState)(nil), "schedulerobjects.Node.StateByJobRunIdEntry") - proto.RegisterType((*NodeType)(nil), "schedulerobjects.NodeType") - proto.RegisterMapType((map[string]string)(nil), "schedulerobjects.NodeType.LabelsEntry") - proto.RegisterMapType((map[string]string)(nil), "schedulerobjects.NodeType.UnsetIndexedLabelsEntry") proto.RegisterType((*QueueClusterResourceUsage)(nil), "schedulerobjects.QueueClusterResourceUsage") proto.RegisterMapType((map[string]ResourceList)(nil), "schedulerobjects.QueueClusterResourceUsage.ResourcesByPriorityClassNameEntry") proto.RegisterMapType((map[int32]ResourceList)(nil), "schedulerobjects.QueueClusterResourceUsage.ResourcesByPriorityEntry") @@ -945,131 +861,125 @@ func init() { } var fileDescriptor_97dadc5fbd620721 = []byte{ - // 1978 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0x4f, 0x73, 0x1b, 0x49, - 0x15, 0xf7, 0xc8, 0xb6, 0x2c, 0xb5, 0x1c, 0x5b, 0x6e, 0x3b, 0xc9, 0x58, 0x49, 0x34, 0x5a, 0x6d, - 0xd8, 0x32, 0xec, 0xae, 0xc4, 0x7a, 0xa9, 0x22, 0x15, 0xb8, 0x48, 0xb6, 0x21, 0x32, 0x89, 0xec, - 0x8c, 0x6d, 0x28, 0xa8, 0x62, 0xa7, 0x5a, 0x9a, 0xb6, 0x32, 0xeb, 0x51, 0xb7, 0x32, 0xd3, 0x13, - 0x56, 0x9c, 0xe1, 0x40, 0x51, 0xb5, 0x6c, 0x51, 0x0b, 0x6c, 0x15, 0x14, 0xd4, 0x7e, 0x09, 0x38, - 0x70, 0xe0, 0x9a, 0xe3, 0x1e, 0x39, 0x09, 0x2a, 0xb9, 0xe9, 0x53, 0x50, 0xdd, 0x3d, 0x23, 0xb5, - 0x66, 0x24, 0xcb, 0xcb, 0x12, 0x72, 0xb2, 0xfa, 0xfd, 0xfd, 0xbd, 0xd7, 0xaf, 0x5f, 0xbf, 0x1e, - 0x83, 0xfb, 0x0e, 0x61, 0xd8, 0x23, 0xc8, 0xad, 0xfa, 0xed, 0x27, 0xd8, 0x0e, 0x5c, 0xec, 0x8d, - 0x7f, 0xd1, 0xd6, 0x87, 0xb8, 0xcd, 0xfc, 0x04, 0xa1, 0xd2, 0xf3, 0x28, 0xa3, 0x30, 0x1f, 0xa7, - 0x17, 0x8c, 0x0e, 0xa5, 0x1d, 0x17, 0x57, 0x05, 0xbf, 0x15, 0x9c, 0x57, 0x99, 0xd3, 0xc5, 0x3e, - 0x43, 0xdd, 0x9e, 0x54, 0x29, 0x94, 0x2f, 0xee, 0xf9, 0x15, 0x87, 0x56, 0x51, 0xcf, 0xa9, 0xb6, - 0xa9, 0x87, 0xab, 0xcf, 0xde, 0xab, 0x76, 0x30, 0xc1, 0x1e, 0x62, 0xd8, 0x0e, 0x65, 0xbe, 0x35, - 0x96, 0xe9, 0xa2, 0xf6, 0x13, 0x87, 0x60, 0xaf, 0x5f, 0xed, 0x5d, 0x74, 0x84, 0x92, 0x87, 0x7d, - 0x1a, 0x78, 0x6d, 0x9c, 0xd0, 0x7a, 0xb7, 0xe3, 0xb0, 0x27, 0x41, 0xab, 0xd2, 0xa6, 0xdd, 0x6a, - 0x87, 0x76, 0xe8, 0x18, 0x03, 0x5f, 0x89, 0x85, 0xf8, 0x25, 0xc5, 0xcb, 0xcf, 0x53, 0x20, 0x73, - 0xf0, 0x11, 0x6e, 0x07, 0x8c, 0x7a, 0xb0, 0x04, 0x52, 0x8e, 0xad, 0x6b, 0x25, 0x6d, 0x27, 0x5b, - 0xcf, 0x0f, 0x07, 0xc6, 0xaa, 0x63, 0xbf, 0x43, 0xbb, 0x0e, 0xc3, 0xdd, 0x1e, 0xeb, 0x9b, 0x29, - 0xc7, 0x86, 0x6f, 0x81, 0xa5, 0x1e, 0xa5, 0xae, 0x9e, 0x12, 0x32, 0x70, 0x38, 0x30, 0xd6, 0xf8, - 0x5a, 0x91, 0x12, 0x7c, 0x58, 0x03, 0xcb, 0x84, 0xda, 0xd8, 0xd7, 0x17, 0x4b, 0x8b, 0x3b, 0xb9, - 0xdd, 0x1b, 0x95, 0x44, 0xea, 0x9a, 0xd4, 0xc6, 0xf5, 0xcd, 0xe1, 0xc0, 0x58, 0x17, 0x82, 0x8a, - 0x05, 0xa9, 0x09, 0x3f, 0x00, 0x6b, 0x2e, 0xf2, 0xd9, 0x59, 0xcf, 0x46, 0x0c, 0x9f, 0x3a, 0x5d, - 0xac, 0x2f, 0x97, 0xb4, 0x9d, 0xdc, 0x6e, 0xa1, 0x22, 0x93, 0x5b, 0x89, 0x02, 0xab, 0x9c, 0x46, - 0xc9, 0xad, 0x17, 0x9e, 0x0f, 0x8c, 0x05, 0x0e, 0x6a, 0x52, 0xf3, 0x93, 0x7f, 0x19, 0x9a, 0x19, - 0xa3, 0xc1, 0x23, 0xb0, 0x19, 0x10, 0xe4, 0xfb, 0x4e, 0x87, 0x60, 0xdb, 0xfa, 0x90, 0xb6, 0x2c, - 0x2f, 0x20, 0xbe, 0x9e, 0x2d, 0x2d, 0xee, 0x64, 0xeb, 0xc6, 0x70, 0x60, 0xdc, 0x1a, 0xb3, 0x0f, - 0x69, 0xcb, 0x0c, 0x88, 0x0a, 0x72, 0x23, 0xc1, 0x2c, 0xff, 0x69, 0x1d, 0x2c, 0xf1, 0xa8, 0xae, - 0x96, 0x46, 0x82, 0xba, 0x58, 0x5f, 0x1d, 0xa7, 0x91, 0xaf, 0xd5, 0x34, 0xf2, 0x35, 0xdc, 0x05, - 0x19, 0x1c, 0x6e, 0x8e, 0xbe, 0x29, 0x64, 0x6f, 0x0c, 0x07, 0x06, 0x8c, 0x68, 0x8a, 0xfc, 0x48, - 0x0e, 0x3e, 0x02, 0x59, 0x1e, 0xa9, 0xe5, 0x63, 0x4c, 0xc4, 0x3e, 0x5d, 0x9e, 0xb2, 0xad, 0x30, - 0x65, 0x19, 0xae, 0x74, 0x82, 0x31, 0x11, 0xc9, 0x1a, 0xad, 0x60, 0x0d, 0xa4, 0x19, 0x72, 0x08, - 0xf3, 0xf5, 0x65, 0xb1, 0x95, 0xdb, 0x15, 0x59, 0x96, 0x15, 0xd4, 0x73, 0x2a, 0xbc, 0x74, 0x2b, - 0xcf, 0xde, 0xab, 0x9c, 0x72, 0x89, 0xfa, 0x5a, 0x68, 0x2a, 0x54, 0x30, 0xc3, 0xbf, 0xf0, 0x18, - 0xa4, 0x5d, 0xd4, 0xc2, 0xae, 0xaf, 0xa7, 0x85, 0x89, 0xf2, 0xf4, 0x6a, 0xa8, 0x3c, 0x14, 0x42, - 0x07, 0x84, 0x79, 0xfd, 0xfa, 0xd6, 0x70, 0x60, 0xe4, 0xa5, 0x96, 0x12, 0x65, 0x68, 0x07, 0x5a, - 0x60, 0x9d, 0x51, 0x86, 0x5c, 0x2b, 0x3a, 0x06, 0xbe, 0xbe, 0x22, 0x22, 0x2d, 0x26, 0x4d, 0x9b, - 0xa1, 0xc8, 0x43, 0xc7, 0x67, 0xf5, 0x1b, 0x51, 0x81, 0x08, 0xf5, 0x88, 0xe5, 0x9b, 0xb1, 0x35, - 0xfc, 0xab, 0x06, 0xee, 0x22, 0xd7, 0xa5, 0x6d, 0xc4, 0x50, 0xcb, 0xc5, 0x56, 0xab, 0x6f, 0xf5, - 0x3c, 0x87, 0x7a, 0x0e, 0xeb, 0x5b, 0x88, 0xd8, 0x23, 0xbf, 0x7a, 0x46, 0x44, 0xf4, 0xdd, 0x19, - 0x11, 0xd5, 0xc6, 0x26, 0xea, 0xfd, 0xe3, 0xd0, 0x40, 0x8d, 0xd8, 0x91, 0x23, 0x19, 0xeb, 0x4e, - 0x08, 0xaa, 0x84, 0xe6, 0x88, 0x9b, 0x73, 0x25, 0xa0, 0x07, 0x36, 0x7d, 0x86, 0x98, 0x40, 0x1c, - 0xd6, 0xb4, 0xe5, 0xd8, 0xa2, 0xaa, 0x73, 0xbb, 0x6f, 0xcf, 0x80, 0x79, 0xc2, 0x35, 0xea, 0x7d, - 0x59, 0xc8, 0x0d, 0x5b, 0xa2, 0xba, 0x19, 0xa2, 0x5a, 0xf7, 0x27, 0xb9, 0x66, 0x9c, 0x00, 0x3f, - 0xd7, 0x40, 0x91, 0x50, 0x62, 0x21, 0xaf, 0x8b, 0x6c, 0x64, 0x85, 0x18, 0xb1, 0xad, 0xec, 0xce, - 0x35, 0xe1, 0xff, 0xdb, 0x33, 0xfc, 0x37, 0x29, 0xa9, 0x09, 0xdd, 0x5a, 0xa4, 0x3a, 0xda, 0x09, - 0x89, 0xe5, 0xcd, 0x10, 0xcb, 0x2d, 0x32, 0x5b, 0xd2, 0xbc, 0x8c, 0x09, 0x6b, 0xe0, 0x5a, 0x40, - 0x42, 0xef, 0x3c, 0x7b, 0xfa, 0x7a, 0x49, 0xdb, 0xc9, 0xd4, 0x6f, 0x0d, 0x07, 0xc6, 0xcd, 0x09, - 0x86, 0x52, 0x6d, 0x93, 0x1a, 0xf0, 0xd7, 0x1a, 0xb8, 0x19, 0x45, 0x64, 0x05, 0x3e, 0xea, 0x88, - 0x24, 0x3f, 0x0d, 0x70, 0x80, 0xf5, 0xbc, 0x88, 0xef, 0x9b, 0x33, 0xe2, 0x8b, 0x60, 0x9c, 0x71, - 0xa5, 0x7a, 0xff, 0x31, 0x57, 0x91, 0x81, 0x95, 0x87, 0x03, 0xa3, 0xe8, 0x4d, 0x61, 0x2b, 0x30, - 0xb6, 0xa6, 0xf1, 0x79, 0xfb, 0xf2, 0x70, 0x8f, 0x7a, 0xcc, 0x21, 0x1d, 0x8b, 0x77, 0x4c, 0x8b, - 0xf5, 0x7b, 0x58, 0xdf, 0x10, 0x5d, 0x42, 0xb4, 0xaf, 0x11, 0x9b, 0x63, 0x38, 0xed, 0xf7, 0x54, - 0x9b, 0x1b, 0x09, 0xe6, 0xa8, 0xb5, 0xc3, 0xcb, 0x5b, 0x7b, 0x01, 0x81, 0x9c, 0x72, 0x50, 0xe1, - 0x9b, 0x60, 0xf1, 0x02, 0xf7, 0xc3, 0x6e, 0xb7, 0x31, 0x1c, 0x18, 0xd7, 0x2e, 0x70, 0x5f, 0x51, - 0xe2, 0x5c, 0xf8, 0x75, 0xb0, 0xfc, 0x0c, 0xb9, 0x01, 0x0e, 0xef, 0x0d, 0xd1, 0xf6, 0x05, 0x41, - 0x6d, 0xfb, 0x82, 0x70, 0x3f, 0x75, 0x4f, 0x2b, 0xfc, 0x51, 0x03, 0x5f, 0xbb, 0xd2, 0xd1, 0x51, - 0xbd, 0x2f, 0xcf, 0xf4, 0xde, 0x50, 0xbd, 0xcf, 0xef, 0x11, 0xf3, 0xd0, 0xfd, 0x4a, 0x03, 0x5b, - 0xd3, 0x4e, 0xcc, 0xd5, 0x52, 0xf1, 0x40, 0x05, 0xb3, 0xb6, 0x7b, 0x27, 0x09, 0x46, 0x1a, 0x95, - 0x1e, 0xe6, 0x61, 0xf9, 0xbd, 0x06, 0x4a, 0xf3, 0x4e, 0xcf, 0x6b, 0x49, 0xd2, 0x6f, 0x34, 0xb0, - 0x3d, 0xb3, 0xec, 0xaf, 0x96, 0xa9, 0xff, 0x2d, 0xa2, 0xf2, 0x9f, 0x97, 0x40, 0x66, 0x54, 0xec, - 0x25, 0x90, 0x6a, 0xc8, 0x2b, 0x7a, 0x49, 0x5e, 0xd1, 0x8d, 0x89, 0x2b, 0xba, 0x61, 0x2b, 0xf7, - 0x5e, 0xea, 0xbf, 0xbd, 0xf7, 0x4e, 0x47, 0xf7, 0x9e, 0x9c, 0x82, 0xde, 0x9a, 0xde, 0x1e, 0x38, - 0xa0, 0x2f, 0x71, 0xf7, 0xfd, 0x42, 0x03, 0x30, 0x20, 0x3e, 0x66, 0x0d, 0x62, 0xe3, 0x8f, 0xb0, - 0x2d, 0x35, 0xf5, 0x25, 0xe1, 0x62, 0xf7, 0x12, 0x17, 0x67, 0x09, 0x25, 0xe9, 0xae, 0x34, 0x1c, - 0x18, 0xb7, 0x93, 0x16, 0x15, 0xd7, 0x53, 0xfc, 0xfd, 0x3f, 0xda, 0x40, 0x17, 0xdc, 0x9c, 0x81, - 0xf9, 0x55, 0xb8, 0x2b, 0x3f, 0x4f, 0x83, 0x6d, 0x51, 0xa3, 0x7b, 0x6e, 0xe0, 0x33, 0xec, 0x4d, - 0x94, 0x2f, 0x6c, 0x80, 0x95, 0xb6, 0x87, 0xf9, 0xe9, 0x12, 0x5e, 0x2f, 0x1f, 0xaa, 0x36, 0xc3, - 0x8a, 0x88, 0x54, 0xc4, 0x4c, 0x15, 0x2d, 0x38, 0x2e, 0x79, 0x6b, 0x28, 0xb8, 0x9e, 0xc6, 0x9a, - 0xbe, 0x94, 0x80, 0xf7, 0x00, 0x88, 0x06, 0xbb, 0x86, 0xad, 0x2f, 0x0a, 0x79, 0x7d, 0x38, 0x30, - 0xb6, 0xc6, 0x54, 0x45, 0x49, 0x91, 0x85, 0xbf, 0xd3, 0xf8, 0x05, 0x11, 0xf6, 0x81, 0x71, 0x07, - 0x0d, 0xeb, 0x64, 0x3f, 0x59, 0x27, 0x33, 0x43, 0x1f, 0x1d, 0x33, 0xc5, 0x8c, 0xac, 0x9c, 0x3b, - 0x61, 0x98, 0x53, 0x1d, 0x69, 0xe6, 0x34, 0x32, 0xfc, 0x9b, 0x06, 0x6e, 0x4f, 0xa1, 0xef, 0xb9, - 0xc8, 0xf7, 0x9b, 0x48, 0x4c, 0xf9, 0x1c, 0xe0, 0xa3, 0xaf, 0x08, 0x70, 0x64, 0x4f, 0x22, 0xbd, - 0x1b, 0x22, 0xbd, 0xd4, 0xb5, 0x79, 0x29, 0xb7, 0xf0, 0xb1, 0x06, 0xf4, 0x59, 0xa9, 0x78, 0x2d, - 0x3d, 0xf6, 0x0f, 0x1a, 0x78, 0x63, 0x6e, 0xe8, 0xaf, 0xa5, 0xd7, 0xfe, 0x7d, 0x11, 0x14, 0xa6, - 0xed, 0x94, 0x29, 0xa6, 0x8e, 0xd1, 0xa8, 0xa1, 0xcd, 0x79, 0x45, 0x2a, 0x67, 0x2e, 0xf5, 0x15, - 0xcf, 0xdc, 0xc7, 0x1a, 0xc8, 0x2b, 0xbb, 0x2b, 0x6a, 0x29, 0x6c, 0xcb, 0xf5, 0x64, 0xb0, 0xb3, - 0xb1, 0xab, 0xb5, 0xa6, 0xcc, 0x71, 0xc5, 0xe1, 0xc0, 0x28, 0xc4, 0xed, 0x2b, 0xf1, 0x24, 0x7c, - 0x17, 0x3e, 0xd3, 0xc0, 0xf5, 0xa9, 0xb6, 0xae, 0xb6, 0x61, 0x3f, 0x9c, 0xdc, 0xb0, 0xb7, 0xbf, - 0xc4, 0x71, 0x99, 0xbb, 0x7b, 0xbf, 0x4c, 0x81, 0x55, 0x75, 0xbb, 0xe1, 0x07, 0x20, 0x3b, 0x1e, - 0xe5, 0x35, 0x91, 0xb4, 0x77, 0x2f, 0xaf, 0x90, 0x4a, 0x6c, 0x80, 0xdf, 0x08, 0x37, 0x67, 0x6c, - 0xc7, 0x1c, 0xff, 0x2c, 0x7c, 0xaa, 0x81, 0xb5, 0xd9, 0x33, 0xcb, 0xec, 0x24, 0xfc, 0x78, 0x32, - 0x09, 0x15, 0xe5, 0x8a, 0x1e, 0x7d, 0x31, 0xa9, 0xf4, 0x2e, 0x3a, 0xe2, 0xce, 0x8e, 0xdc, 0x55, - 0x1e, 0x07, 0x88, 0x30, 0x87, 0xf5, 0xe7, 0xe6, 0xe1, 0xd3, 0x65, 0xb0, 0x71, 0x48, 0x5b, 0x27, - 0x32, 0x50, 0x87, 0x74, 0x1a, 0xe4, 0x9c, 0xf2, 0x37, 0xb9, 0xeb, 0x9c, 0x63, 0xe6, 0x74, 0xb1, - 0x80, 0x77, 0x4d, 0xbe, 0xc9, 0x23, 0x9a, 0xfa, 0x26, 0x8f, 0x68, 0xf0, 0x3e, 0x58, 0x45, 0xcc, - 0xea, 0x52, 0x9f, 0x59, 0x94, 0xb4, 0x25, 0xde, 0x8c, 0x6c, 0xe4, 0x88, 0x3d, 0xa2, 0x3e, 0x3b, - 0x22, 0x6d, 0x55, 0x13, 0x8c, 0xa9, 0xf0, 0x3b, 0x20, 0xd7, 0xf3, 0x30, 0xa7, 0x3b, 0xfc, 0xdd, - 0xb2, 0x28, 0x54, 0xb7, 0x87, 0x03, 0xe3, 0xba, 0x42, 0x56, 0x74, 0x55, 0x69, 0xf8, 0x00, 0xe4, - 0xdb, 0x94, 0xb4, 0x03, 0xcf, 0xc3, 0xa4, 0xdd, 0xb7, 0x7c, 0x74, 0x8e, 0xf5, 0x25, 0x61, 0xe1, - 0xce, 0x70, 0x60, 0x6c, 0x2b, 0xbc, 0x13, 0x74, 0xae, 0x5a, 0x59, 0x8f, 0xb1, 0xf8, 0x7b, 0x63, - 0xf4, 0x02, 0x6e, 0xf3, 0x0e, 0x63, 0x89, 0x2f, 0x18, 0xe9, 0xf1, 0x7b, 0xa3, 0x17, 0xef, 0x3f, - 0xea, 0x7b, 0x23, 0xc1, 0x84, 0x27, 0x20, 0xe7, 0x07, 0xad, 0xae, 0xc3, 0x2c, 0x91, 0xca, 0x95, - 0xb9, 0x07, 0x3c, 0x7a, 0xbb, 0x03, 0xa9, 0x36, 0xfa, 0xb0, 0xa3, 0xac, 0xf9, 0xe6, 0x44, 0x9e, - 0xf4, 0xcc, 0x78, 0x73, 0x22, 0x9a, 0xba, 0x39, 0x11, 0x0d, 0xfe, 0x0c, 0x6c, 0xca, 0x12, 0xb6, - 0x3c, 0xfc, 0x34, 0x70, 0x3c, 0xdc, 0xc5, 0xe3, 0xcf, 0x1d, 0x77, 0x93, 0x75, 0x7e, 0x24, 0xfe, - 0x9a, 0x8a, 0xac, 0x1c, 0xa1, 0x68, 0x82, 0xae, 0x8e, 0x50, 0x49, 0x2e, 0xac, 0x82, 0x95, 0x67, - 0xd8, 0xf3, 0x1d, 0x4a, 0xf4, 0xac, 0xc0, 0x7a, 0x7d, 0x38, 0x30, 0x36, 0x42, 0x92, 0xa2, 0x1b, - 0x49, 0xdd, 0x5f, 0xfa, 0xec, 0x73, 0x43, 0x2b, 0xff, 0x56, 0x03, 0x30, 0x89, 0x01, 0xba, 0x60, - 0xbd, 0x47, 0x6d, 0x95, 0x14, 0x0e, 0x2a, 0x6f, 0x24, 0x43, 0x38, 0x9e, 0x14, 0x94, 0xc5, 0x10, - 0xd3, 0x1e, 0x03, 0x78, 0xb0, 0x60, 0xc6, 0x4d, 0xd7, 0xd7, 0xc0, 0xaa, 0x9a, 0xad, 0xf2, 0x3f, - 0xd2, 0x60, 0x3d, 0x66, 0x15, 0xfa, 0x60, 0x95, 0x3f, 0x4c, 0x4f, 0xb0, 0x8b, 0xdb, 0x8c, 0x7a, - 0x61, 0xe7, 0x78, 0x7f, 0x2e, 0x1c, 0x31, 0xb2, 0x46, 0x5a, 0xb2, 0x7f, 0x14, 0x86, 0x03, 0xe3, - 0x86, 0x6a, 0x4c, 0x49, 0xcf, 0x84, 0x13, 0x78, 0x0c, 0x32, 0xe8, 0xfc, 0xdc, 0x21, 0xbc, 0x02, - 0x64, 0x5b, 0xb8, 0x3d, 0x6d, 0x72, 0xaf, 0x85, 0x32, 0xb2, 0x3e, 0x22, 0x0d, 0xb5, 0x3e, 0x22, - 0x1a, 0x3c, 0x03, 0x39, 0x46, 0x5d, 0xec, 0x21, 0xe6, 0x50, 0x12, 0xcd, 0xf2, 0xc5, 0xa9, 0xcf, - 0x81, 0x91, 0xd8, 0xe8, 0x36, 0x52, 0x55, 0x4d, 0x75, 0x01, 0x29, 0xc8, 0x21, 0x42, 0x28, 0x0b, - 0xcd, 0xae, 0xcc, 0x9a, 0xdf, 0xe3, 0xc9, 0xa9, 0x8d, 0x95, 0x64, 0x6e, 0x44, 0x2f, 0x50, 0x4c, - 0xa9, 0xbd, 0x40, 0x21, 0xc3, 0x43, 0x90, 0x8f, 0x5a, 0x03, 0x25, 0xc7, 0xd4, 0x75, 0xda, 0x7d, - 0xf1, 0x49, 0x35, 0x2b, 0x6f, 0xaf, 0x38, 0x4f, 0xbd, 0xbd, 0xe2, 0x3c, 0xf8, 0x73, 0x30, 0xfa, - 0x2a, 0x31, 0x51, 0x71, 0x69, 0x91, 0xf1, 0x9d, 0x69, 0xc9, 0x31, 0xa7, 0xc8, 0xd7, 0x6f, 0x87, - 0x69, 0x9a, 0x6a, 0xcd, 0x9c, 0x4a, 0x2d, 0x74, 0xc0, 0x46, 0xa2, 0x40, 0x5e, 0xc9, 0xfb, 0xe3, - 0x1c, 0xe4, 0xe3, 0xc9, 0x7e, 0x15, 0x7e, 0x0e, 0x97, 0x32, 0x99, 0x7c, 0xb6, 0xfc, 0x17, 0x0d, - 0x6c, 0x1f, 0x07, 0xae, 0x8f, 0xbc, 0x93, 0xa8, 0x04, 0x0e, 0x69, 0x6b, 0x1f, 0x33, 0xe4, 0xb8, - 0x3e, 0x37, 0x79, 0x48, 0x5b, 0x8d, 0xe8, 0xb3, 0xb2, 0x30, 0x29, 0x08, 0xaa, 0x49, 0x41, 0xe0, - 0xa2, 0x8f, 0xe3, 0xcf, 0x8b, 0xf8, 0x3c, 0x22, 0x25, 0xe0, 0x3b, 0x20, 0xcd, 0x2f, 0x38, 0xcc, - 0xc2, 0xa7, 0x85, 0x78, 0x79, 0x4a, 0x8a, 0xfa, 0xf2, 0x94, 0x94, 0x6f, 0x1c, 0x81, 0x9c, 0xf2, - 0x6d, 0x02, 0xe6, 0xc0, 0xca, 0x59, 0xf3, 0x07, 0xcd, 0xa3, 0x1f, 0x35, 0xf3, 0x0b, 0x7c, 0x71, - 0x7c, 0xd0, 0xdc, 0x6f, 0x34, 0xbf, 0x9f, 0xd7, 0xf8, 0xc2, 0x3c, 0x6b, 0x36, 0xf9, 0x22, 0x05, - 0xaf, 0x81, 0xec, 0xc9, 0xd9, 0xde, 0xde, 0xc1, 0xc1, 0xfe, 0xc1, 0x7e, 0x7e, 0x11, 0x02, 0x90, - 0xfe, 0x5e, 0xad, 0xf1, 0xf0, 0x60, 0x3f, 0xbf, 0x54, 0xff, 0xe9, 0xf3, 0x17, 0x45, 0xed, 0x8b, - 0x17, 0x45, 0xed, 0xdf, 0x2f, 0x8a, 0xda, 0x27, 0x2f, 0x8b, 0x0b, 0x5f, 0xbc, 0x2c, 0x2e, 0xfc, - 0xf3, 0x65, 0x71, 0xe1, 0x27, 0x7b, 0xca, 0x7f, 0x31, 0xe4, 0x67, 0xc5, 0x9e, 0x47, 0xf9, 0x79, - 0x08, 0x57, 0xd5, 0x2b, 0xfc, 0xbb, 0xa6, 0x95, 0x16, 0x97, 0xc8, 0xfb, 0xff, 0x09, 0x00, 0x00, - 0xff, 0xff, 0xad, 0xb8, 0xe9, 0xc4, 0xdc, 0x19, 0x00, 0x00, + // 1887 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0xdb, 0xc8, + 0x15, 0x37, 0xfd, 0x21, 0xcb, 0x23, 0x7f, 0xc8, 0x63, 0x27, 0xa1, 0x95, 0x44, 0xd4, 0x6a, 0xd3, + 0xc2, 0xed, 0xee, 0x52, 0x5d, 0x6f, 0x81, 0x06, 0x69, 0x2f, 0x92, 0xed, 0x36, 0x76, 0x13, 0xd9, + 0xa1, 0xe3, 0x16, 0x2d, 0xd0, 0x25, 0x46, 0xe4, 0x58, 0xe1, 0x9a, 0x9a, 0x61, 0xc8, 0x61, 0x5a, + 0xf5, 0xde, 0x43, 0x51, 0x60, 0xbb, 0x28, 0xb6, 0xed, 0x02, 0x2d, 0x50, 0xec, 0x3f, 0xd1, 0x1e, + 0x7a, 0xe8, 0x35, 0xc7, 0x3d, 0xf6, 0xa4, 0x16, 0xc9, 0x4d, 0x7f, 0x45, 0x31, 0x43, 0x52, 0x1c, + 0x91, 0x92, 0xe5, 0x62, 0x77, 0x91, 0x93, 0x34, 0xef, 0xf3, 0xf7, 0xde, 0xbc, 0x79, 0xc3, 0x37, + 0xe0, 0x81, 0x43, 0x18, 0xf6, 0x09, 0x72, 0x1b, 0x81, 0xf5, 0x0c, 0xdb, 0xa1, 0x8b, 0xfd, 0xf4, + 0x1f, 0xed, 0x7c, 0x84, 0x2d, 0x16, 0xe4, 0x08, 0xba, 0xe7, 0x53, 0x46, 0x61, 0x39, 0x4b, 0xaf, + 0x68, 0x5d, 0x4a, 0xbb, 0x2e, 0x6e, 0x08, 0x7e, 0x27, 0xbc, 0x68, 0x30, 0xa7, 0x87, 0x03, 0x86, + 0x7a, 0x5e, 0xa4, 0x52, 0xa9, 0x5f, 0xde, 0x0f, 0x74, 0x87, 0x36, 0x90, 0xe7, 0x34, 0x2c, 0xea, + 0xe3, 0xc6, 0x8b, 0xf7, 0x1b, 0x5d, 0x4c, 0xb0, 0x8f, 0x18, 0xb6, 0x63, 0x99, 0xef, 0xa6, 0x32, + 0x3d, 0x64, 0x3d, 0x73, 0x08, 0xf6, 0xfb, 0x0d, 0xef, 0xb2, 0x2b, 0x94, 0x7c, 0x1c, 0xd0, 0xd0, + 0xb7, 0x70, 0x4e, 0xeb, 0xbd, 0xae, 0xc3, 0x9e, 0x85, 0x1d, 0xdd, 0xa2, 0xbd, 0x46, 0x97, 0x76, + 0x69, 0x8a, 0x81, 0xaf, 0xc4, 0x42, 0xfc, 0x8b, 0xc4, 0xeb, 0x2f, 0xe7, 0x41, 0xf1, 0xf0, 0x57, + 0xd8, 0x0a, 0x19, 0xf5, 0x61, 0x0d, 0xcc, 0x3b, 0xb6, 0xaa, 0xd4, 0x94, 0xdd, 0x95, 0x56, 0x79, + 0x38, 0xd0, 0x56, 0x1d, 0xfb, 0x5d, 0xda, 0x73, 0x18, 0xee, 0x79, 0xac, 0x6f, 0xcc, 0x3b, 0x36, + 0xfc, 0x26, 0x58, 0xf4, 0x28, 0x75, 0xd5, 0x79, 0x21, 0x03, 0x87, 0x03, 0x6d, 0x9d, 0xaf, 0x25, + 0x29, 0xc1, 0x87, 0x4d, 0xb0, 0x44, 0xa8, 0x8d, 0x03, 0x75, 0xa1, 0xb6, 0xb0, 0x5b, 0xda, 0xbb, + 0xa9, 0xe7, 0x52, 0xd7, 0xa6, 0x36, 0x6e, 0x6d, 0x0d, 0x07, 0xda, 0x86, 0x10, 0x94, 0x2c, 0x44, + 0x9a, 0xf0, 0x43, 0xb0, 0xee, 0xa2, 0x80, 0x9d, 0x7b, 0x36, 0x62, 0xf8, 0xa9, 0xd3, 0xc3, 0xea, + 0x52, 0x4d, 0xd9, 0x2d, 0xed, 0x55, 0xf4, 0x28, 0xb9, 0x7a, 0x12, 0x98, 0xfe, 0x34, 0x49, 0x6e, + 0xab, 0xf2, 0x72, 0xa0, 0xcd, 0x71, 0x50, 0xe3, 0x9a, 0x9f, 0xfc, 0x47, 0x53, 0x8c, 0x0c, 0x0d, + 0x9e, 0x80, 0xad, 0x90, 0xa0, 0x20, 0x70, 0xba, 0x04, 0xdb, 0xe6, 0x47, 0xb4, 0x63, 0xfa, 0x21, + 0x09, 0xd4, 0x95, 0xda, 0xc2, 0xee, 0x4a, 0x4b, 0x1b, 0x0e, 0xb4, 0xdb, 0x29, 0xfb, 0x98, 0x76, + 0x8c, 0x90, 0xc8, 0x20, 0x37, 0x73, 0xcc, 0xfa, 0x5f, 0x37, 0xc0, 0x22, 0x8f, 0xea, 0x7a, 0x69, + 0x24, 0xa8, 0x87, 0xd5, 0xd5, 0x34, 0x8d, 0x7c, 0x2d, 0xa7, 0x91, 0xaf, 0xe1, 0x1e, 0x28, 0xe2, + 0x78, 0x73, 0xd4, 0x2d, 0x21, 0x7b, 0x73, 0x38, 0xd0, 0x60, 0x42, 0x93, 0xe4, 0x47, 0x72, 0xf0, + 0x31, 0x58, 0xe1, 0x91, 0x9a, 0x01, 0xc6, 0x44, 0xec, 0xd3, 0xd5, 0x29, 0xdb, 0x8e, 0x53, 0x56, + 0xe4, 0x4a, 0x67, 0x18, 0x13, 0x91, 0xac, 0xd1, 0x0a, 0x36, 0x41, 0x81, 0x21, 0x87, 0xb0, 0x40, + 0x5d, 0x12, 0x5b, 0xb9, 0xa3, 0x47, 0x65, 0xa9, 0x23, 0xcf, 0xd1, 0x79, 0xe9, 0xea, 0x2f, 0xde, + 0xd7, 0x9f, 0x72, 0x89, 0xd6, 0x7a, 0x6c, 0x2a, 0x56, 0x30, 0xe2, 0x5f, 0x78, 0x0a, 0x0a, 0x2e, + 0xea, 0x60, 0x37, 0x50, 0x0b, 0xc2, 0x44, 0x7d, 0x72, 0x35, 0xe8, 0x8f, 0x84, 0xd0, 0x21, 0x61, + 0x7e, 0xbf, 0xb5, 0x3d, 0x1c, 0x68, 0xe5, 0x48, 0x4b, 0x8a, 0x32, 0xb6, 0x03, 0x4d, 0xb0, 0xc1, + 0x28, 0x43, 0xae, 0x99, 0x1c, 0x83, 0x40, 0x5d, 0x16, 0x91, 0x56, 0xf3, 0xa6, 0x8d, 0x58, 0xe4, + 0x91, 0x13, 0xb0, 0xd6, 0xcd, 0xa4, 0x40, 0x84, 0x7a, 0xc2, 0x0a, 0x8c, 0xcc, 0x1a, 0xfe, 0x5d, + 0x01, 0xf7, 0x90, 0xeb, 0x52, 0x0b, 0x31, 0xd4, 0x71, 0xb1, 0xd9, 0xe9, 0x9b, 0x9e, 0xef, 0x50, + 0xdf, 0x61, 0x7d, 0x13, 0x11, 0x7b, 0xe4, 0x57, 0x2d, 0x8a, 0x88, 0x7e, 0x30, 0x25, 0xa2, 0x66, + 0x6a, 0xa2, 0xd5, 0x3f, 0x8d, 0x0d, 0x34, 0x89, 0x9d, 0x38, 0x8a, 0x62, 0xdd, 0x8d, 0x41, 0xd5, + 0xd0, 0x0c, 0x71, 0x63, 0xa6, 0x04, 0xf4, 0xc1, 0x56, 0xc0, 0x10, 0x13, 0x88, 0xe3, 0x9a, 0x36, + 0x1d, 0x5b, 0x54, 0x75, 0x69, 0xef, 0x9d, 0x29, 0x30, 0xcf, 0xb8, 0x46, 0xab, 0x1f, 0x15, 0xf2, + 0x91, 0x1d, 0xa1, 0xba, 0x15, 0xa3, 0xda, 0x08, 0xc6, 0xb9, 0x46, 0x96, 0x00, 0x3f, 0x57, 0x40, + 0x95, 0x50, 0x62, 0x22, 0xbf, 0x87, 0x6c, 0x64, 0xc6, 0x18, 0xb1, 0x2d, 0xed, 0xce, 0x9a, 0xf0, + 0xff, 0xbd, 0x29, 0xfe, 0xdb, 0x94, 0x34, 0x85, 0x6e, 0x33, 0x51, 0x1d, 0xed, 0x44, 0x84, 0xe5, + 0xed, 0x18, 0xcb, 0x6d, 0x32, 0x5d, 0xd2, 0xb8, 0x8a, 0x09, 0x9b, 0x60, 0x2d, 0x24, 0xb1, 0x77, + 0x9e, 0x3d, 0x75, 0xa3, 0xa6, 0xec, 0x16, 0x5b, 0xb7, 0x87, 0x03, 0xed, 0xd6, 0x18, 0x43, 0xaa, + 0xb6, 0x71, 0x0d, 0xf8, 0x3b, 0x05, 0xdc, 0x4a, 0x22, 0x32, 0xc3, 0x00, 0x75, 0x45, 0x92, 0x9f, + 0x87, 0x38, 0xc4, 0x6a, 0x59, 0xc4, 0xf7, 0x9d, 0x29, 0xf1, 0x25, 0x30, 0xce, 0xb9, 0x52, 0xab, + 0xff, 0x84, 0xab, 0x44, 0x81, 0xd5, 0x87, 0x03, 0xad, 0xea, 0x4f, 0x60, 0x4b, 0x30, 0xb6, 0x27, + 0xf1, 0x79, 0xfb, 0xf2, 0xb1, 0x47, 0x7d, 0xe6, 0x90, 0xae, 0xc9, 0x3b, 0xa6, 0xc9, 0xfa, 0x1e, + 0x56, 0x37, 0x45, 0x97, 0x10, 0xed, 0x6b, 0xc4, 0xe6, 0x18, 0x9e, 0xf6, 0x3d, 0xd9, 0xe6, 0x66, + 0x8e, 0x39, 0x6a, 0xed, 0xf0, 0xea, 0xd6, 0x5e, 0x41, 0xa0, 0x24, 0x1d, 0x54, 0xf8, 0x36, 0x58, + 0xb8, 0xc4, 0xfd, 0xb8, 0xdb, 0x6d, 0x0e, 0x07, 0xda, 0xda, 0x25, 0xee, 0x4b, 0x4a, 0x9c, 0x0b, + 0xbf, 0x05, 0x96, 0x5e, 0x20, 0x37, 0xc4, 0xf1, 0xbd, 0x21, 0xda, 0xbe, 0x20, 0xc8, 0x6d, 0x5f, + 0x10, 0x1e, 0xcc, 0xdf, 0x57, 0x2a, 0x7f, 0x51, 0xc0, 0x37, 0xae, 0x75, 0x74, 0x64, 0xef, 0x4b, + 0x53, 0xbd, 0x1f, 0xc9, 0xde, 0x67, 0xf7, 0x88, 0x59, 0xe8, 0x7e, 0xab, 0x80, 0xed, 0x49, 0x27, + 0xe6, 0x7a, 0xa9, 0x78, 0x28, 0x83, 0x59, 0xdf, 0xbb, 0x9b, 0x07, 0x13, 0x19, 0x8d, 0x3c, 0xcc, + 0xc2, 0xf2, 0x27, 0x05, 0xd4, 0x66, 0x9d, 0x9e, 0x37, 0x92, 0xa4, 0xdf, 0x2b, 0x60, 0x67, 0x6a, + 0xd9, 0x5f, 0x2f, 0x53, 0x5f, 0x2d, 0xa2, 0xfa, 0xcb, 0x02, 0xd8, 0x11, 0x10, 0xf6, 0xdd, 0x30, + 0x60, 0xd8, 0x1f, 0x43, 0x07, 0x8f, 0xc0, 0xb2, 0xe5, 0x63, 0x9e, 0x3c, 0x81, 0xea, 0xea, 0x3b, + 0x73, 0x2b, 0x6e, 0x47, 0x89, 0x8a, 0xb8, 0x32, 0x93, 0x05, 0x2f, 0xf6, 0xa8, 0x29, 0x48, 0xc5, + 0xfe, 0x3c, 0x73, 0xa6, 0x23, 0x09, 0x78, 0x1f, 0x80, 0xe4, 0xde, 0x3e, 0xb2, 0xd5, 0x05, 0x21, + 0xaf, 0x0e, 0x07, 0xda, 0x76, 0x4a, 0x95, 0x94, 0x24, 0x59, 0xf8, 0x47, 0x85, 0x9f, 0xff, 0x78, + 0x9b, 0xd3, 0x03, 0xa2, 0x2e, 0x8a, 0x46, 0x74, 0x90, 0xcf, 0xd5, 0xd4, 0xd0, 0x47, 0x59, 0x94, + 0xcc, 0x44, 0xcd, 0xe9, 0x6e, 0x1c, 0xe6, 0x44, 0x47, 0x8a, 0x31, 0x89, 0x0c, 0xff, 0xa1, 0x80, + 0x3b, 0x13, 0xe8, 0xfb, 0x2e, 0x0a, 0x82, 0x36, 0x12, 0x1f, 0x71, 0x1c, 0xe0, 0xe3, 0x2f, 0x09, + 0x70, 0x64, 0x2f, 0x42, 0x7a, 0x2f, 0x46, 0x7a, 0xa5, 0x6b, 0xe3, 0x4a, 0x6e, 0xe5, 0x63, 0x05, + 0xa8, 0xd3, 0x52, 0xf1, 0x46, 0x8e, 0xd0, 0x9f, 0x15, 0xf0, 0xd6, 0xcc, 0xd0, 0xdf, 0xc8, 0x51, + 0xfa, 0xe7, 0x02, 0xa8, 0x4c, 0xda, 0x29, 0x43, 0x5c, 0x2a, 0xa3, 0x9b, 0x44, 0x99, 0x31, 0x24, + 0x48, 0x67, 0x6e, 0xfe, 0x4b, 0x9e, 0xb9, 0x8f, 0x15, 0x50, 0x96, 0x76, 0x57, 0xd4, 0x52, 0x3c, + 0x7b, 0xb4, 0xf2, 0xc1, 0x4e, 0xc7, 0x2e, 0xd7, 0x9a, 0x74, 0x4d, 0x57, 0x87, 0x03, 0xad, 0x92, + 0xb5, 0x2f, 0xc5, 0x93, 0xf3, 0x5d, 0xf9, 0x4c, 0x01, 0x37, 0x26, 0xda, 0xba, 0xde, 0x86, 0xfd, + 0x64, 0x7c, 0xc3, 0xde, 0xf9, 0x3f, 0x8e, 0xcb, 0xcc, 0xdd, 0xfb, 0xcd, 0x3c, 0x58, 0x95, 0xb7, + 0x1b, 0x7e, 0x08, 0x56, 0xd2, 0x2f, 0x35, 0x45, 0x24, 0xed, 0xbd, 0xab, 0x2b, 0x44, 0xcf, 0x7c, + 0x9f, 0x6d, 0xc6, 0x9b, 0x93, 0xda, 0x31, 0xd2, 0xbf, 0x95, 0x4f, 0x15, 0xb0, 0x3e, 0xfd, 0x4a, + 0x9a, 0x9e, 0x84, 0x9f, 0x8d, 0x27, 0x41, 0x97, 0x26, 0x8f, 0xd1, 0x40, 0xac, 0x7b, 0x97, 0x5d, + 0x31, 0x8a, 0x24, 0xee, 0xf4, 0x27, 0x21, 0x22, 0xcc, 0x61, 0xfd, 0x99, 0x79, 0xf8, 0x74, 0x09, + 0x6c, 0x1e, 0xd3, 0xce, 0x59, 0x14, 0xa8, 0x43, 0xba, 0x47, 0xe4, 0x82, 0xf2, 0x91, 0xcb, 0x75, + 0x2e, 0x30, 0x1f, 0xd8, 0x05, 0xbc, 0xb5, 0x68, 0xe4, 0x4a, 0x68, 0xf2, 0xc8, 0x95, 0xd0, 0xe0, + 0x03, 0xb0, 0x8a, 0x98, 0xd9, 0xa3, 0x01, 0x33, 0x29, 0xb1, 0x22, 0xbc, 0xc5, 0xa8, 0x91, 0x23, + 0xf6, 0x98, 0x06, 0xec, 0x84, 0x58, 0xb2, 0x26, 0x48, 0xa9, 0xf0, 0xfb, 0xa0, 0xe4, 0xf9, 0x98, + 0xd3, 0x1d, 0xfe, 0x59, 0xba, 0x20, 0x54, 0x77, 0x86, 0x03, 0xed, 0x86, 0x44, 0x96, 0x74, 0x65, + 0x69, 0xf8, 0x10, 0x94, 0x2d, 0x4a, 0xac, 0xd0, 0xf7, 0x31, 0xb1, 0xfa, 0x66, 0x80, 0x2e, 0xb0, + 0xba, 0x28, 0x2c, 0xdc, 0x1d, 0x0e, 0xb4, 0x1d, 0x89, 0x77, 0x86, 0x2e, 0x64, 0x2b, 0x1b, 0x19, + 0x16, 0xff, 0x9c, 0x1c, 0x0d, 0x38, 0x16, 0xef, 0x30, 0xa6, 0x18, 0x50, 0x0b, 0xe9, 0xe7, 0xa4, + 0x97, 0xed, 0x3f, 0xf2, 0xe7, 0x64, 0x8e, 0x09, 0xcf, 0x40, 0x29, 0x08, 0x3b, 0x3d, 0x87, 0x99, + 0x22, 0x95, 0xcb, 0x33, 0x0f, 0x78, 0x32, 0x9a, 0x81, 0x48, 0x6d, 0x34, 0xb7, 0x4b, 0x6b, 0xbe, + 0x39, 0x89, 0x27, 0xb5, 0x98, 0x6e, 0x4e, 0x42, 0x93, 0x37, 0x27, 0xa1, 0xc1, 0x5f, 0x82, 0xad, + 0xa8, 0x84, 0x4d, 0x1f, 0x3f, 0x0f, 0x1d, 0x1f, 0xf7, 0x70, 0x3a, 0xcd, 0xde, 0xcb, 0xd7, 0xf9, + 0x89, 0xf8, 0x35, 0x24, 0xd9, 0x56, 0x8d, 0x5f, 0x2d, 0x34, 0x47, 0x97, 0xdc, 0xc1, 0x3c, 0x17, + 0x36, 0xc0, 0xf2, 0x0b, 0xec, 0x07, 0x0e, 0x25, 0xea, 0x8a, 0xc0, 0x7a, 0x63, 0x38, 0xd0, 0x36, + 0x63, 0x92, 0xa4, 0x9b, 0x48, 0x3d, 0x58, 0xfc, 0xec, 0x73, 0x4d, 0xa9, 0xff, 0x41, 0x01, 0x30, + 0x8f, 0x01, 0xba, 0x60, 0xc3, 0xa3, 0xb6, 0x4c, 0x8a, 0x3f, 0x54, 0xde, 0xca, 0x87, 0x70, 0x3a, + 0x2e, 0x18, 0x15, 0x43, 0x46, 0x3b, 0x05, 0xf0, 0x70, 0xce, 0xc8, 0x9a, 0x6e, 0xad, 0x83, 0x55, + 0x39, 0x5b, 0xf5, 0x7f, 0x15, 0xc0, 0x46, 0xc6, 0x2a, 0x0c, 0xc0, 0x2a, 0x9f, 0x3b, 0xce, 0xb0, + 0x8b, 0x2d, 0x46, 0xfd, 0xb8, 0x73, 0x7c, 0x30, 0x13, 0x8e, 0x98, 0x89, 0x12, 0xad, 0xa8, 0x7f, + 0x54, 0x86, 0x03, 0xed, 0xa6, 0x6c, 0x4c, 0x4a, 0xcf, 0x98, 0x13, 0x78, 0x0a, 0x8a, 0xe8, 0xe2, + 0xc2, 0x21, 0xbc, 0x02, 0xa2, 0xb6, 0x70, 0x67, 0xd2, 0x83, 0x44, 0x33, 0x96, 0x89, 0xea, 0x23, + 0xd1, 0x90, 0xeb, 0x23, 0xa1, 0xc1, 0x73, 0x50, 0x62, 0xd4, 0xc5, 0x3e, 0x62, 0x0e, 0x25, 0xc9, + 0x83, 0x55, 0x75, 0xe2, 0x2b, 0xc7, 0x48, 0x6c, 0x74, 0x1b, 0xc9, 0xaa, 0x86, 0xbc, 0x80, 0x14, + 0x94, 0x10, 0x21, 0x94, 0xc5, 0x66, 0x97, 0x85, 0xd9, 0xbd, 0xd9, 0xc9, 0x69, 0xa6, 0x4a, 0x51, + 0x6e, 0x44, 0x2f, 0x90, 0x4c, 0xc9, 0xbd, 0x40, 0x22, 0xc3, 0x63, 0x50, 0x4e, 0x5a, 0x03, 0x25, + 0xa7, 0xd4, 0x75, 0xac, 0xbe, 0x78, 0x31, 0x5b, 0x89, 0x6e, 0xaf, 0x2c, 0x4f, 0xbe, 0xbd, 0xb2, + 0x3c, 0xf8, 0x6b, 0x30, 0x1a, 0x3a, 0xc7, 0x2a, 0xae, 0x20, 0x32, 0xbe, 0x3b, 0x29, 0x39, 0xc6, + 0x04, 0xf9, 0xd6, 0x9d, 0x38, 0x4d, 0x13, 0xad, 0x19, 0x13, 0xa9, 0x95, 0x2e, 0xd8, 0xcc, 0x15, + 0xc8, 0xd7, 0x32, 0x65, 0x5e, 0x80, 0x72, 0x36, 0xd9, 0x5f, 0x87, 0x9f, 0xe3, 0xc5, 0x62, 0xb1, + 0xbc, 0x52, 0xff, 0x9b, 0x02, 0x76, 0x4e, 0x43, 0x37, 0x40, 0xfe, 0x59, 0x52, 0x02, 0xc7, 0xb4, + 0x73, 0x80, 0x19, 0x72, 0xdc, 0x80, 0x9b, 0x3c, 0xa6, 0x9d, 0xa3, 0xe4, 0xd5, 0x50, 0x98, 0x14, + 0x04, 0xd9, 0xa4, 0x20, 0x70, 0xd1, 0x27, 0xd9, 0xf1, 0x22, 0xfb, 0x3d, 0x12, 0x49, 0xc0, 0x77, + 0x41, 0x81, 0x5f, 0x70, 0x98, 0xc5, 0xa3, 0x85, 0x78, 0x54, 0x8b, 0x28, 0xf2, 0xa3, 0x5a, 0x44, + 0xf9, 0xf6, 0x09, 0x28, 0x49, 0xa3, 0x27, 0x2c, 0x81, 0xe5, 0xf3, 0xf6, 0x8f, 0xdb, 0x27, 0x3f, + 0x6d, 0x97, 0xe7, 0xf8, 0xe2, 0xf4, 0xb0, 0x7d, 0x70, 0xd4, 0xfe, 0x51, 0x59, 0xe1, 0x0b, 0xe3, + 0xbc, 0xdd, 0xe6, 0x8b, 0x79, 0xb8, 0x06, 0x56, 0xce, 0xce, 0xf7, 0xf7, 0x0f, 0x0f, 0x0f, 0x0e, + 0x0f, 0xca, 0x0b, 0x10, 0x80, 0xc2, 0x0f, 0x9b, 0x47, 0x8f, 0x0e, 0x0f, 0xca, 0x8b, 0xad, 0x5f, + 0xbc, 0x7c, 0x55, 0x55, 0xbe, 0x78, 0x55, 0x55, 0xfe, 0xfb, 0xaa, 0xaa, 0x7c, 0xf2, 0xba, 0x3a, + 0xf7, 0xc5, 0xeb, 0xea, 0xdc, 0xbf, 0x5f, 0x57, 0xe7, 0x7e, 0xbe, 0x2f, 0x3d, 0x52, 0x47, 0xaf, + 0x46, 0x9e, 0x4f, 0xf9, 0x79, 0x88, 0x57, 0x8d, 0x6b, 0xbc, 0xc6, 0x77, 0x0a, 0xe2, 0x12, 0xf9, + 0xe0, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xcf, 0x3c, 0x2e, 0xbb, 0x17, 0x00, 0x00, } func (m *Executor) Marshal() (dAtA []byte, err error) { @@ -1354,86 +1264,6 @@ func (m *Node) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *NodeType) 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 *NodeType) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *NodeType) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.UnsetIndexedLabels) > 0 { - for k := range m.UnsetIndexedLabels { - v := m.UnsetIndexedLabels[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintSchedulerobjects(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x22 - } - } - if len(m.Labels) > 0 { - for k := range m.Labels { - v := m.Labels[k] - baseI := i - i -= len(v) - copy(dAtA[i:], v) - i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(v))) - i-- - dAtA[i] = 0x12 - i -= len(k) - copy(dAtA[i:], k) - i = encodeVarintSchedulerobjects(dAtA, i, uint64(len(k))) - i-- - dAtA[i] = 0xa - i = encodeVarintSchedulerobjects(dAtA, i, uint64(baseI-i)) - i-- - dAtA[i] = 0x1a - } - } - if len(m.Taints) > 0 { - for iNdEx := len(m.Taints) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.Taints[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintSchedulerobjects(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - } - if m.Id != 0 { - i = encodeVarintSchedulerobjects(dAtA, i, uint64(m.Id)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - func (m *QueueClusterResourceUsage) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2065,40 +1895,6 @@ func (m *Node) Size() (n int) { return n } -func (m *NodeType) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Id != 0 { - n += 1 + sovSchedulerobjects(uint64(m.Id)) - } - if len(m.Taints) > 0 { - for _, e := range m.Taints { - l = e.Size() - n += 1 + l + sovSchedulerobjects(uint64(l)) - } - } - if len(m.Labels) > 0 { - for k, v := range m.Labels { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovSchedulerobjects(uint64(len(k))) + 1 + len(v) + sovSchedulerobjects(uint64(len(v))) - n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize)) - } - } - if len(m.UnsetIndexedLabels) > 0 { - for k, v := range m.UnsetIndexedLabels { - _ = k - _ = v - mapEntrySize := 1 + len(k) + sovSchedulerobjects(uint64(len(k))) + 1 + len(v) + sovSchedulerobjects(uint64(len(v))) - n += mapEntrySize + 1 + sovSchedulerobjects(uint64(mapEntrySize)) - } - } - return n -} - func (m *QueueClusterResourceUsage) Size() (n int) { if m == nil { return 0 @@ -3455,363 +3251,6 @@ func (m *Node) Unmarshal(dAtA []byte) error { } return nil } -func (m *NodeType) 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 ErrIntOverflowSchedulerobjects - } - 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: NodeType: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: NodeType: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) - } - m.Id = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Id |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Taints", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSchedulerobjects - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Taints = append(m.Taints, v1.Taint{}) - if err := m.Taints[len(m.Taints)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Labels", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSchedulerobjects - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Labels == nil { - m.Labels = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthSchedulerobjects - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthSchedulerobjects - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipSchedulerobjects(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSchedulerobjects - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.Labels[mapkey] = mapvalue - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field UnsetIndexedLabels", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthSchedulerobjects - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.UnsetIndexedLabels == nil { - m.UnsetIndexedLabels = make(map[string]string) - } - var mapkey string - var mapvalue string - for iNdEx < postIndex { - entryPreIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - if fieldNum == 1 { - var stringLenmapkey uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapkey |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapkey := int(stringLenmapkey) - if intStringLenmapkey < 0 { - return ErrInvalidLengthSchedulerobjects - } - postStringIndexmapkey := iNdEx + intStringLenmapkey - if postStringIndexmapkey < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postStringIndexmapkey > l { - return io.ErrUnexpectedEOF - } - mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) - iNdEx = postStringIndexmapkey - } else if fieldNum == 2 { - var stringLenmapvalue uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowSchedulerobjects - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLenmapvalue |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLenmapvalue := int(stringLenmapvalue) - if intStringLenmapvalue < 0 { - return ErrInvalidLengthSchedulerobjects - } - postStringIndexmapvalue := iNdEx + intStringLenmapvalue - if postStringIndexmapvalue < 0 { - return ErrInvalidLengthSchedulerobjects - } - if postStringIndexmapvalue > l { - return io.ErrUnexpectedEOF - } - mapvalue = string(dAtA[iNdEx:postStringIndexmapvalue]) - iNdEx = postStringIndexmapvalue - } else { - iNdEx = entryPreIndex - skippy, err := skipSchedulerobjects(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSchedulerobjects - } - if (iNdEx + skippy) > postIndex { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - m.UnsetIndexedLabels[mapkey] = mapvalue - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipSchedulerobjects(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthSchedulerobjects - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *QueueClusterResourceUsage) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.proto b/internal/scheduler/schedulerobjects/schedulerobjects.proto index c7197ccc08b..11f74418541 100644 --- a/internal/scheduler/schedulerobjects/schedulerobjects.proto +++ b/internal/scheduler/schedulerobjects/schedulerobjects.proto @@ -66,26 +66,6 @@ enum JobRunState { FAILED = 4; } -// NodeType represents a particular combination of taints and labels. -// The scheduler groups nodes by node type. When assigning pods to nodes, -// the scheduler only considers nodes with a NodeType for which the taints and labels match. -message NodeType { - // Unique identifier. Used for map lookup. - uint64 Id = 1; - // Kubernetes taints. - // To reduce the number of distinct node types, - // may contain only a subset of the taints of the node the node type is created from. - repeated k8s.io.api.core.v1.Taint taints = 2 [(gogoproto.nullable) = false]; - // Kubernetes labels. - // To reduce the number of distinct node types, - // may contain only a subset of the labels of the node the node type is created from. - map labels = 3; - // Well-known labels not set by this node type. - // Used to filter out nodes when looking for nodes for a pod - // that requires at least one well-known label to be set. - map unsetIndexedLabels = 4; -} - // Captures the resource usage of a particular queue in a given cluster. message QueueClusterResourceUsage { google.protobuf.Timestamp created = 1 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];