From 33f3a278468db59b0ba513e96d5e3bc8ebd9d562 Mon Sep 17 00:00:00 2001 From: Rob Smith <34475852+robertdavidsmith@users.noreply.github.com> Date: Wed, 8 Jan 2025 10:51:23 +0000 Subject: [PATCH] Scheduler: calculate node.allocatableByPriority after load from db (#4127) Signed-off-by: Robert Smith --- internal/scheduler/internaltypes/node.go | 32 +-- .../scheduler/internaltypes/node_factory.go | 16 +- .../internaltypes/resource_list_map_util.go | 9 +- .../resource_list_map_util_test.go | 6 + .../schedulerobjects/schedulerobjects.pb.go | 183 +++++++++--------- .../schedulerobjects/schedulerobjects.proto | 2 +- .../scheduler/scheduling/scheduling_algo.go | 1 + internal/scheduler/simulator/simulator.go | 6 +- internal/scheduler/submitcheck.go | 1 + .../scheduler/testfixtures/testfixtures.go | 2 +- 10 files changed, 139 insertions(+), 119 deletions(-) diff --git a/internal/scheduler/internaltypes/node.go b/internal/scheduler/internaltypes/node.go index 8203a0b3e38..2011219103f 100644 --- a/internal/scheduler/internaltypes/node.go +++ b/internal/scheduler/internaltypes/node.go @@ -4,7 +4,6 @@ import ( "fmt" "math" - "github.com/pkg/errors" "golang.org/x/exp/maps" v1 "k8s.io/api/core/v1" @@ -60,20 +59,19 @@ func FromSchedulerObjectsNode(node *schedulerobjects.Node, nodeIndex uint64, indexedTaints map[string]bool, indexedNodeLabels map[string]bool, + allowedPriorities []int32, resourceListFactory *ResourceListFactory, -) (*Node, error) { +) *Node { + totalResources := resourceListFactory.FromNodeProto(node.TotalResources.Resources) + allocatableByPriority := map[int32]ResourceList{} - minimumPriority := int32(math.MaxInt32) - for p, rl := range node.AllocatableByPriorityAndResource { - if p < minimumPriority { - minimumPriority = p - } - allocatableByPriority[p] = resourceListFactory.FromNodeProto(rl.Resources) + for _, p := range allowedPriorities { + allocatableByPriority[p] = totalResources } - if minimumPriority < 0 { - return nil, errors.Errorf("found negative priority %d on node %s; negative priorities are reserved for internal use", minimumPriority, node.Id) + for p, rl := range node.UnallocatableResources { + MarkAllocated(allocatableByPriority, p, resourceListFactory.FromJobResourceListIgnoreUnknown(rl.Resources)) } - allocatableByPriority[EvictedPriority] = allocatableByPriority[minimumPriority] + allocatableByPriority[EvictedPriority] = allocatableByPriority[minInt32(allowedPriorities)] unallocatableResources := map[int32]ResourceList{} for p, u := range node.UnallocatableResources { @@ -91,10 +89,10 @@ func FromSchedulerObjectsNode(node *schedulerobjects.Node, node.Labels, indexedTaints, indexedNodeLabels, - resourceListFactory.FromNodeProto(node.TotalResources.Resources), + totalResources, unallocatableResources, allocatableByPriority, - ), nil + ) } func CreateNodeAndType( @@ -301,3 +299,11 @@ func deepCopyLabels(labels map[string]string) map[string]string { } return result } + +func minInt32(arr []int32) int32 { + result := int32(math.MaxInt32) + for _, val := range arr { + result = min(result, val) + } + return result +} diff --git a/internal/scheduler/internaltypes/node_factory.go b/internal/scheduler/internaltypes/node_factory.go index 76d454c11ad..850cd7d01ad 100644 --- a/internal/scheduler/internaltypes/node_factory.go +++ b/internal/scheduler/internaltypes/node_factory.go @@ -6,6 +6,7 @@ import ( v1 "k8s.io/api/core/v1" + "github.com/armadaproject/armada/internal/common/types" "github.com/armadaproject/armada/internal/common/util" "github.com/armadaproject/armada/internal/scheduler/schedulerobjects" ) @@ -27,6 +28,9 @@ type NodeFactory struct { // If not set, no labels are indexed. indexedNodeLabels map[string]bool + // Allowed priorities, includes home and away (from config) + allowedPriorities []int32 + // Factory for internaltypes.ResourceList resourceListFactory *ResourceListFactory @@ -37,11 +41,13 @@ type NodeFactory struct { func NewNodeFactory( indexedTaints []string, indexedNodeLabels []string, + priorityClasses map[string]types.PriorityClass, resourceListFactory *ResourceListFactory, ) *NodeFactory { return &NodeFactory{ indexedTaints: util.StringListToSet(indexedTaints), indexedNodeLabels: util.StringListToSet(indexedNodeLabels), + allowedPriorities: types.AllowedPriorities(priorityClasses), resourceListFactory: resourceListFactory, nodeIndexCounter: atomic.Uint64{}, } @@ -76,11 +82,12 @@ func (f *NodeFactory) CreateNodeAndType( ) } -func (f *NodeFactory) FromSchedulerObjectsNode(node *schedulerobjects.Node) (*Node, error) { +func (f *NodeFactory) FromSchedulerObjectsNode(node *schedulerobjects.Node) *Node { return FromSchedulerObjectsNode(node, f.allocateNodeIndex(), f.indexedTaints, f.indexedNodeLabels, + f.allowedPriorities, f.resourceListFactory, ) } @@ -93,12 +100,7 @@ func (f *NodeFactory) FromSchedulerObjectsExecutors(executors []*schedulerobject errorLogger(fmt.Sprintf("Executor name mismatch: %q != %q", node.Executor, executor.Id)) continue } - itNode, err := f.FromSchedulerObjectsNode(node) - if err != nil { - errorLogger(fmt.Sprintf("Invalid node %s: %v", node.Name, err)) - continue - } - result = append(result, itNode) + result = append(result, f.FromSchedulerObjectsNode(node)) } } return result diff --git a/internal/scheduler/internaltypes/resource_list_map_util.go b/internal/scheduler/internaltypes/resource_list_map_util.go index 443f172bd64..78d43cfa583 100644 --- a/internal/scheduler/internaltypes/resource_list_map_util.go +++ b/internal/scheduler/internaltypes/resource_list_map_util.go @@ -1,13 +1,18 @@ package internaltypes import ( + "sort" "strings" + + "golang.org/x/exp/maps" ) func RlMapToString(m map[string]ResourceList) string { + keys := maps.Keys(m) + sort.Strings(keys) results := []string{} - for k, v := range m { - results = append(results, k+"="+v.String()) + for _, k := range keys { + results = append(results, k+"="+m[k].String()) } return strings.Join(results, " ") } diff --git a/internal/scheduler/internaltypes/resource_list_map_util_test.go b/internal/scheduler/internaltypes/resource_list_map_util_test.go index 7f6fb74b9b6..199d3a00322 100644 --- a/internal/scheduler/internaltypes/resource_list_map_util_test.go +++ b/internal/scheduler/internaltypes/resource_list_map_util_test.go @@ -6,6 +6,12 @@ import ( "github.com/stretchr/testify/assert" ) +func TestRlMapToString(t *testing.T) { + factory := testFactory() + + assert.Equal(t, "a=(memory=1024,cpu=1) b=(memory=2048,cpu=2)", RlMapToString(testMapAllPositive(factory))) +} + func TestRlMapSumValues(t *testing.T) { factory := testFactory() diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go index fce7b391122..031b1aa097c 100644 --- a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go +++ b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go @@ -166,7 +166,7 @@ type Node struct { // Resources available for jobs of a given priority. // E.g., AvailableResources[5]["cpu"] is the amount of CPU available to jobs with priority 5, // where available resources = unused resources + resources assigned to lower-priority jobs. - AllocatableByPriorityAndResource map[int32]ResourceList `protobuf:"bytes,8,rep,name=allocatable_by_priority_and_resource,json=allocatableByPriorityAndResource,proto3" json:"allocatableByPriorityAndResource" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AllocatableByPriorityAndResource map[int32]ResourceList `protobuf:"bytes,8,rep,name=allocatable_by_priority_and_resource,json=allocatableByPriorityAndResource,proto3" json:"allocatableByPriorityAndResource" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // Deprecated: Do not use. // Ids of the job runs currently assigned to this node and their current state. StateByJobRunId map[string]JobRunState `protobuf:"bytes,9,rep,name=state_by_job_run_id,json=stateByJobRunId,proto3" json:"stateByJobRunId" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=schedulerobjects.JobRunState"` // Resource allocated to non-Armada pods on this node. @@ -263,6 +263,7 @@ func (m *Node) GetTotalResources() ResourceList { return ResourceList{} } +// Deprecated: Do not use. func (m *Node) GetAllocatableByPriorityAndResource() map[int32]ResourceList { if m != nil { return m.AllocatableByPriorityAndResource @@ -788,116 +789,116 @@ func init() { } var fileDescriptor_97dadc5fbd620721 = []byte{ - // 1735 bytes of a gzipped FileDescriptorProto + // 1737 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0xdb, 0xc8, 0x15, 0x37, 0xfd, 0x29, 0x8d, 0xfc, 0x21, 0x8d, 0xbd, 0x09, 0xa3, 0x64, 0x45, 0x55, 0xbb, 0x5b, - 0x38, 0x6d, 0x97, 0xc2, 0x7a, 0x5b, 0x20, 0x48, 0x8b, 0x02, 0x62, 0xe2, 0x36, 0x4e, 0xb3, 0xb2, - 0x23, 0x47, 0x28, 0x5a, 0xa0, 0x4b, 0x8c, 0xc8, 0xb1, 0xc2, 0x35, 0x35, 0xc3, 0x25, 0x87, 0x69, - 0xd9, 0x7b, 0x0f, 0x45, 0x2f, 0xdb, 0x62, 0x0b, 0x14, 0xe8, 0xa9, 0xff, 0x44, 0x6f, 0x45, 0xaf, - 0x41, 0x4f, 0x7b, 0xec, 0x89, 0x2d, 0x92, 0x1b, 0xff, 0x83, 0xde, 0x8a, 0x19, 0x92, 0xe2, 0x48, - 0x94, 0x2d, 0x5f, 0x16, 0x7b, 0xb2, 0xe7, 0xf7, 0x3e, 0xe7, 0xcd, 0x6f, 0xde, 0x3c, 0x0a, 0x3c, + 0x38, 0xdb, 0x2e, 0x85, 0xf5, 0xb6, 0x40, 0x90, 0x16, 0x05, 0xc4, 0xc4, 0x6d, 0x9c, 0x66, 0x65, + 0x47, 0x8e, 0x50, 0xb4, 0x40, 0x97, 0x18, 0x91, 0x63, 0x85, 0x6b, 0x6a, 0x86, 0x4b, 0x0e, 0xd3, + 0xb2, 0xf7, 0x1e, 0x8a, 0x5e, 0xb6, 0xc5, 0x16, 0x28, 0xd0, 0x53, 0xff, 0x8b, 0x5e, 0x8a, 0x5e, + 0x83, 0x9e, 0xf6, 0xd8, 0x13, 0x5b, 0x24, 0x37, 0xfe, 0x0b, 0xbd, 0x14, 0x33, 0x24, 0xc5, 0x91, + 0x28, 0x5b, 0xbe, 0x2c, 0x7a, 0xb2, 0xe7, 0xf7, 0x3e, 0xe7, 0xcd, 0x6f, 0xde, 0x3c, 0x0a, 0x3c, 0x74, 0x08, 0xc3, 0x3e, 0x41, 0x6e, 0x37, 0xb0, 0x5e, 0x62, 0x3b, 0x74, 0xb1, 0x5f, 0xfc, 0x47, - 0x47, 0x9f, 0x61, 0x8b, 0x05, 0x25, 0x40, 0xf7, 0x7c, 0xca, 0x28, 0xac, 0xcf, 0xe3, 0x4d, 0x6d, + 0x47, 0x9f, 0x63, 0x8b, 0x05, 0x25, 0x40, 0xf7, 0x7c, 0xca, 0x28, 0xac, 0xcf, 0xe3, 0x4d, 0x6d, 0x4c, 0xe9, 0xd8, 0xc5, 0x5d, 0x21, 0x1f, 0x85, 0x17, 0x5d, 0xe6, 0x4c, 0x70, 0xc0, 0xd0, 0xc4, 0x4b, 0x4d, 0x9a, 0x9d, 0xcb, 0x07, 0x81, 0xee, 0xd0, 0x2e, 0xf2, 0x9c, 0xae, 0x45, 0x7d, 0xdc, - 0x7d, 0xf5, 0x51, 0x77, 0x8c, 0x09, 0xf6, 0x11, 0xc3, 0x76, 0xa6, 0xf3, 0xfd, 0x42, 0x67, 0x82, + 0x7d, 0xf5, 0x71, 0x77, 0x8c, 0x09, 0xf6, 0x11, 0xc3, 0x76, 0xa6, 0xf3, 0xbd, 0x42, 0x67, 0x82, 0xac, 0x97, 0x0e, 0xc1, 0x7e, 0xd4, 0xf5, 0x2e, 0xc7, 0xc2, 0xc8, 0xc7, 0x01, 0x0d, 0x7d, 0x0b, - 0x97, 0xac, 0x3e, 0x1c, 0x3b, 0xec, 0x65, 0x38, 0xd2, 0x2d, 0x3a, 0xe9, 0x8e, 0xe9, 0x98, 0x16, - 0x39, 0xf0, 0x95, 0x58, 0x88, 0xff, 0x52, 0xf5, 0xce, 0xeb, 0x55, 0x50, 0x39, 0xfe, 0x0d, 0xb6, + 0x97, 0xac, 0x3e, 0x1a, 0x3b, 0xec, 0x65, 0x38, 0xd2, 0x2d, 0x3a, 0xe9, 0x8e, 0xe9, 0x98, 0x16, + 0x39, 0xf0, 0x95, 0x58, 0x88, 0xff, 0x52, 0xf5, 0xce, 0xeb, 0x55, 0x50, 0x39, 0xfe, 0x35, 0xb6, 0x42, 0x46, 0x7d, 0xd8, 0x06, 0xab, 0x8e, 0xad, 0x2a, 0x6d, 0xe5, 0xb0, 0x6a, 0xd4, 0x93, 0x58, - 0xdb, 0x76, 0xec, 0xef, 0xd1, 0x89, 0xc3, 0xf0, 0xc4, 0x63, 0xd1, 0x60, 0xd5, 0xb1, 0xe1, 0xb7, + 0xdb, 0x76, 0xec, 0xef, 0xd2, 0x89, 0xc3, 0xf0, 0xc4, 0x63, 0xd1, 0x60, 0xd5, 0xb1, 0xe1, 0xb7, 0xc1, 0xba, 0x47, 0xa9, 0xab, 0xae, 0x0a, 0x1d, 0x98, 0xc4, 0xda, 0x2e, 0x5f, 0x4b, 0x5a, 0x42, 0x0e, 0x7b, 0x60, 0x83, 0x50, 0x1b, 0x07, 0xea, 0x5a, 0x7b, 0xed, 0xb0, 0x76, 0x74, 0x4b, 0x2f, 0x95, 0xae, 0x4f, 0x6d, 0x6c, 0xec, 0x27, 0xb1, 0xb6, 0x27, 0x14, 0x25, 0x0f, 0xa9, 0x25, 0xfc, - 0x14, 0xec, 0xba, 0x28, 0x60, 0x43, 0xcf, 0x46, 0x0c, 0xbf, 0x70, 0x26, 0x58, 0xdd, 0x68, 0x2b, + 0x0c, 0xec, 0xba, 0x28, 0x60, 0x43, 0xcf, 0x46, 0x0c, 0xbf, 0x70, 0x26, 0x58, 0xdd, 0x68, 0x2b, 0x87, 0xb5, 0xa3, 0xa6, 0x9e, 0x16, 0x57, 0xcf, 0x37, 0xa6, 0xbf, 0xc8, 0x8b, 0x6b, 0x34, 0x5f, - 0xc7, 0xda, 0x0a, 0x4f, 0x6a, 0xd6, 0xf2, 0x8b, 0xff, 0x68, 0xca, 0x60, 0x0e, 0x83, 0xa7, 0x60, - 0x3f, 0x24, 0x28, 0x08, 0x9c, 0x31, 0xc1, 0xb6, 0xf9, 0x19, 0x1d, 0x99, 0x7e, 0x48, 0x02, 0xb5, + 0xc7, 0xda, 0x0a, 0x4f, 0x6a, 0xd6, 0xf2, 0xcb, 0x7f, 0x6b, 0xca, 0x60, 0x0e, 0x83, 0xa7, 0x60, + 0x3f, 0x24, 0x28, 0x08, 0x9c, 0x31, 0xc1, 0xb6, 0xf9, 0x39, 0x1d, 0x99, 0x7e, 0x48, 0x02, 0xb5, 0xda, 0x5e, 0x3b, 0xac, 0x1a, 0x5a, 0x12, 0x6b, 0x77, 0x0b, 0xf1, 0x53, 0x3a, 0x1a, 0x84, 0x44, - 0x4e, 0xb2, 0x51, 0x12, 0x76, 0xfe, 0xb7, 0x03, 0xd6, 0xf9, 0xae, 0x6e, 0x56, 0x46, 0x82, 0x26, + 0x4e, 0xb2, 0x51, 0x12, 0x76, 0xfe, 0xbb, 0x03, 0xd6, 0xf9, 0xae, 0x6e, 0x56, 0x46, 0x82, 0x26, 0x58, 0xdd, 0x2e, 0xca, 0xc8, 0xd7, 0x72, 0x19, 0xf9, 0x1a, 0x1e, 0x81, 0x0a, 0xce, 0x0e, 0x47, - 0xdd, 0x17, 0xba, 0xb7, 0x92, 0x58, 0x83, 0x39, 0x26, 0xe9, 0x4f, 0xf5, 0xe0, 0x27, 0xa0, 0xca, + 0xdd, 0x17, 0xba, 0xb7, 0x92, 0x58, 0x83, 0x39, 0x26, 0xe9, 0x4f, 0xf5, 0xe0, 0xa7, 0xa0, 0xca, 0x77, 0x6a, 0x06, 0x18, 0x13, 0x71, 0x4e, 0xd7, 0x97, 0xec, 0x20, 0x2b, 0x59, 0x85, 0x1b, 0x9d, 0x63, 0x4c, 0x44, 0xb1, 0xa6, 0x2b, 0xd8, 0x03, 0x9b, 0x0c, 0x39, 0x84, 0x05, 0xea, 0x86, 0x38, - 0xca, 0x3b, 0x7a, 0x4a, 0x4b, 0x1d, 0x79, 0x8e, 0xce, 0xa9, 0xab, 0xbf, 0xfa, 0x48, 0x7f, 0xc1, + 0xca, 0x3b, 0x7a, 0x4a, 0x4b, 0x1d, 0x79, 0x8e, 0xce, 0xa9, 0xab, 0xbf, 0xfa, 0x58, 0x7f, 0xc1, 0x35, 0x8c, 0xdd, 0xcc, 0x55, 0x66, 0x30, 0xc8, 0xfe, 0xc2, 0x33, 0xb0, 0xe9, 0xa2, 0x11, 0x76, 0x03, 0x75, 0x53, 0xb8, 0xe8, 0x2c, 0x66, 0x83, 0xfe, 0x4c, 0x28, 0x1d, 0x13, 0xe6, 0x47, 0xc6, 0x41, 0x12, 0x6b, 0xf5, 0xd4, 0x4a, 0xda, 0x65, 0xe6, 0x07, 0x9a, 0x60, 0x8f, 0x51, 0x86, 0x5c, 0x33, 0xbf, 0x06, 0x81, 0xba, 0x25, 0x76, 0xda, 0x2a, 0xbb, 0x1e, 0x64, 0x2a, 0xcf, 0x9c, 0x80, - 0x19, 0xb7, 0x72, 0x82, 0x08, 0xf3, 0x5c, 0x14, 0x0c, 0xe6, 0xd6, 0xf0, 0xef, 0x0a, 0x78, 0x1f, + 0x19, 0xb7, 0x72, 0x82, 0x08, 0xf3, 0x5c, 0x14, 0x0c, 0xe6, 0xd6, 0xf0, 0x6f, 0x0a, 0x78, 0x1f, 0xb9, 0x2e, 0xb5, 0x10, 0x43, 0x23, 0x17, 0x9b, 0xa3, 0xc8, 0xf4, 0x7c, 0x87, 0xfa, 0x0e, 0x8b, - 0x4c, 0x44, 0xec, 0x69, 0x5c, 0xb5, 0x22, 0x76, 0xf4, 0xa3, 0x2b, 0x76, 0xd4, 0x2b, 0x5c, 0x18, - 0xd1, 0x59, 0xe6, 0xa0, 0x47, 0xec, 0x3c, 0x50, 0xba, 0xd7, 0xc3, 0x2c, 0xa9, 0x36, 0x5a, 0xa2, - 0x3e, 0x58, 0xaa, 0x01, 0x7d, 0xb0, 0x1f, 0x30, 0xc4, 0x44, 0xc6, 0x19, 0xa7, 0x4d, 0xc7, 0x16, - 0xac, 0xae, 0x1d, 0x7d, 0xf7, 0x8a, 0x34, 0xcf, 0xb9, 0x85, 0x11, 0xa5, 0x44, 0x3e, 0xb1, 0xd3, - 0xac, 0x6e, 0x67, 0x59, 0xed, 0x05, 0xb3, 0xd2, 0xc1, 0x3c, 0x00, 0xff, 0xa0, 0x80, 0xdb, 0x21, - 0x91, 0xcb, 0x55, 0x1c, 0xcb, 0x8e, 0x08, 0x7c, 0x74, 0x45, 0xe0, 0xa1, 0x6c, 0x35, 0xad, 0x7e, - 0x1a, 0xbf, 0x95, 0xc5, 0xbf, 0x15, 0x2e, 0x54, 0x1a, 0x5c, 0x81, 0xc3, 0x1e, 0xd8, 0x09, 0x49, - 0x16, 0x8e, 0x4b, 0xd4, 0xbd, 0xb6, 0x72, 0x58, 0x31, 0xee, 0x26, 0xb1, 0x76, 0x7b, 0x46, 0x20, - 0xf1, 0x6a, 0xd6, 0x82, 0xb7, 0x06, 0x1f, 0x7b, 0xd4, 0x67, 0x0e, 0x19, 0x9b, 0xbc, 0x1b, 0x99, - 0x2c, 0xf2, 0xb0, 0xda, 0x10, 0x37, 0x50, 0xb4, 0x86, 0xa9, 0x98, 0x6f, 0xe3, 0x45, 0xe4, 0xc9, - 0xce, 0x1a, 0x25, 0xe1, 0xb4, 0x6d, 0xc2, 0x25, 0x6d, 0xf3, 0xcf, 0x0a, 0x68, 0xe7, 0xb5, 0x33, - 0xc3, 0x00, 0x8d, 0xc5, 0x39, 0x7e, 0x1e, 0xe2, 0x10, 0x0b, 0xda, 0x09, 0x27, 0x07, 0xa2, 0xa4, - 0xef, 0x95, 0x4b, 0x7a, 0x46, 0xa9, 0xfb, 0x9c, 0xeb, 0xe6, 0xc5, 0x30, 0xee, 0x27, 0xb1, 0xf6, - 0x41, 0xee, 0x70, 0xc8, 0xfd, 0x19, 0x91, 0xd0, 0xe8, 0x11, 0xfb, 0x6c, 0x36, 0x81, 0xbb, 0xd7, - 0xa8, 0x35, 0x11, 0xa8, 0x49, 0x97, 0x13, 0xbe, 0x07, 0xd6, 0x2e, 0x71, 0x94, 0x75, 0xb8, 0x46, - 0x12, 0x6b, 0x3b, 0x97, 0x38, 0x92, 0x7c, 0x71, 0x29, 0xbc, 0x0f, 0x36, 0x5e, 0x21, 0x37, 0xc4, - 0xd9, 0x5b, 0x21, 0x5a, 0xbd, 0x00, 0xe4, 0x56, 0x2f, 0x80, 0x87, 0xab, 0x0f, 0x94, 0xe6, 0x5f, - 0x15, 0xf0, 0xc1, 0x8d, 0xae, 0x8b, 0x1c, 0x7d, 0xe3, 0xca, 0xe8, 0x27, 0x72, 0xf4, 0xe5, 0x7d, - 0x61, 0x59, 0x76, 0xbf, 0x57, 0xc0, 0xc1, 0xa2, 0x5b, 0x72, 0xb3, 0x52, 0x3c, 0x91, 0x93, 0xd9, - 0x3d, 0x7a, 0xb7, 0x9c, 0x4c, 0xea, 0x34, 0x8d, 0xb0, 0x2c, 0x97, 0x3f, 0x2a, 0xe0, 0xee, 0x35, - 0x17, 0xe7, 0x9b, 0xa8, 0x4f, 0xe7, 0x1f, 0x0a, 0x68, 0x94, 0xe8, 0x37, 0xa5, 0xbd, 0xb2, 0x84, - 0xf6, 0xf7, 0xc1, 0x86, 0xe0, 0xb8, 0x4c, 0x15, 0x01, 0xc8, 0xc1, 0x04, 0x00, 0x87, 0xa0, 0x5a, - 0x34, 0x97, 0xb5, 0x1b, 0xe5, 0x7e, 0x3b, 0x89, 0xb5, 0xfd, 0xa9, 0x91, 0xe4, 0xb2, 0xf0, 0xd4, - 0xf9, 0xdd, 0x2a, 0xd8, 0x96, 0x8d, 0xe0, 0xa7, 0x72, 0x1c, 0x45, 0xdc, 0xb8, 0x0f, 0xaf, 0x8f, - 0xa3, 0xcf, 0xf5, 0xaf, 0x46, 0xd6, 0xbf, 0x0a, 0x3f, 0x52, 0xc0, 0xe6, 0x97, 0x0a, 0xd8, 0xbd, - 0xfa, 0xdc, 0xae, 0xa6, 0xd2, 0x2f, 0x66, 0xcf, 0x4d, 0x97, 0x5e, 0xe3, 0xe9, 0x90, 0xa8, 0x7b, - 0x97, 0x63, 0xf1, 0x3c, 0xe7, 0xe1, 0xf4, 0xe7, 0x21, 0x22, 0xcc, 0x61, 0xd1, 0xd2, 0x73, 0xfc, - 0x72, 0x03, 0x34, 0x9e, 0xd2, 0xd1, 0x79, 0xba, 0x51, 0x87, 0x8c, 0x4f, 0xc8, 0x05, 0xe5, 0x63, - 0x88, 0xeb, 0x5c, 0x60, 0x3e, 0xc4, 0x8a, 0xf4, 0x76, 0xd2, 0x31, 0x24, 0xc7, 0xe4, 0x31, 0x24, - 0xc7, 0xe0, 0x43, 0xb0, 0x8d, 0x98, 0x39, 0xa1, 0x01, 0x33, 0x29, 0xb1, 0xd2, 0x7c, 0x2b, 0x86, - 0x9a, 0xc4, 0xda, 0x01, 0x62, 0x9f, 0xd0, 0x80, 0x9d, 0x12, 0x4b, 0xb6, 0x04, 0x05, 0x0a, 0x7f, - 0x08, 0x6a, 0x9e, 0x8f, 0x39, 0xee, 0xf0, 0x06, 0xbe, 0x26, 0x4c, 0xef, 0x24, 0xb1, 0xf6, 0x8e, - 0x04, 0x4b, 0xb6, 0xb2, 0x36, 0x7c, 0x02, 0xea, 0x16, 0x25, 0x56, 0xe8, 0xfb, 0x98, 0x58, 0x91, - 0x19, 0xa0, 0x0b, 0xac, 0xae, 0x0b, 0x0f, 0xef, 0x26, 0xb1, 0x76, 0x47, 0x92, 0x9d, 0xa3, 0x0b, - 0xd9, 0xcb, 0xde, 0x9c, 0x88, 0x3f, 0x03, 0xd3, 0x47, 0xdf, 0x72, 0x51, 0x10, 0x98, 0x62, 0x68, - 0xdb, 0x2c, 0x9e, 0x81, 0x5c, 0xfc, 0x88, 0x4b, 0xfb, 0xb3, 0x13, 0x5c, 0xa3, 0x24, 0x84, 0xe7, - 0xa0, 0x16, 0x84, 0xa3, 0x89, 0xc3, 0x4c, 0x51, 0xca, 0xad, 0xa5, 0xc3, 0x59, 0x3e, 0xae, 0x80, - 0xd4, 0x6c, 0x3a, 0xcb, 0x4a, 0x6b, 0x7e, 0x38, 0x79, 0x24, 0xb5, 0x52, 0x1c, 0x4e, 0x8e, 0xc9, - 0x87, 0x93, 0x63, 0xf0, 0xd7, 0x60, 0x3f, 0xa5, 0xb0, 0xe9, 0xe3, 0xcf, 0x43, 0xc7, 0xc7, 0x13, - 0x5c, 0x4c, 0x78, 0xef, 0x97, 0x79, 0x7e, 0x2a, 0xfe, 0x0e, 0x24, 0x5d, 0xa3, 0x9d, 0xc4, 0xda, - 0x3d, 0x5a, 0xc2, 0xa5, 0x70, 0xb0, 0x2c, 0x85, 0x5d, 0xb0, 0xf5, 0x0a, 0xfb, 0x81, 0x43, 0x89, - 0x5a, 0x15, 0xb9, 0xbe, 0x93, 0xc4, 0x5a, 0x23, 0x83, 0x24, 0xdb, 0x5c, 0xeb, 0xe1, 0xfa, 0x5f, - 0xfe, 0xa6, 0x29, 0x9d, 0x3f, 0x29, 0x00, 0x96, 0x73, 0x80, 0x2e, 0xd8, 0xf3, 0xa8, 0x2d, 0x43, - 0x82, 0x9e, 0xb5, 0xa3, 0x6f, 0x2d, 0x7a, 0x1c, 0x67, 0x14, 0x53, 0x32, 0xcc, 0x59, 0x17, 0x09, - 0x3c, 0x59, 0x19, 0xcc, 0xbb, 0x36, 0x76, 0xc1, 0xb6, 0x5c, 0xad, 0xce, 0x3f, 0x37, 0xc1, 0xde, - 0x9c, 0x57, 0x18, 0x80, 0x6d, 0x3e, 0x2f, 0x9c, 0x63, 0x17, 0x5b, 0x7c, 0x68, 0x4f, 0x3b, 0xc7, - 0xc7, 0x4b, 0xd3, 0x11, 0xe3, 0x50, 0x6e, 0x95, 0xf6, 0x8f, 0x26, 0x9f, 0x7d, 0x64, 0x67, 0x52, - 0x79, 0x66, 0x82, 0xc0, 0x33, 0x50, 0x41, 0x17, 0x17, 0x0e, 0xe1, 0x0c, 0x48, 0xdb, 0xc2, 0xbd, - 0x45, 0x43, 0x7a, 0x2f, 0xd3, 0x49, 0xf9, 0x91, 0x5b, 0xc8, 0xfc, 0xc8, 0x31, 0x38, 0x04, 0x35, - 0x46, 0x5d, 0xfe, 0x5d, 0xe9, 0x50, 0x92, 0x7f, 0xc4, 0xb5, 0x16, 0x4e, 0xfe, 0x53, 0x35, 0x63, - 0x3f, 0x23, 0xab, 0x6c, 0x3a, 0x90, 0x17, 0x90, 0x82, 0x1a, 0x22, 0x84, 0xb2, 0xcc, 0xed, 0xd6, - 0x55, 0xb3, 0xe1, 0x7c, 0x71, 0x7a, 0x85, 0x51, 0x5a, 0x1b, 0xd1, 0x0b, 0x24, 0x57, 0x72, 0x2f, - 0x90, 0x60, 0xf8, 0x14, 0xd4, 0xf3, 0xd6, 0x40, 0xc9, 0x19, 0x75, 0x1d, 0x2b, 0x12, 0x5f, 0x91, - 0x55, 0xa3, 0x95, 0xc4, 0x5a, 0x73, 0x5e, 0x26, 0xb9, 0x29, 0xd9, 0xc1, 0xdf, 0x82, 0x83, 0xbc, - 0x9f, 0xce, 0x30, 0x6e, 0x53, 0x54, 0xfc, 0x70, 0x51, 0x71, 0x06, 0x0b, 0xf4, 0x8d, 0x7b, 0x59, - 0x99, 0x16, 0x7a, 0x1b, 0x2c, 0x44, 0x9b, 0x63, 0xd0, 0x28, 0x11, 0xe4, 0x6b, 0x99, 0xc2, 0x2e, - 0x40, 0x7d, 0xbe, 0xd8, 0x5f, 0x47, 0x9c, 0xa7, 0xeb, 0x95, 0x4a, 0xbd, 0xda, 0xf9, 0xd7, 0x2a, - 0xa8, 0xe7, 0x3f, 0x3e, 0x9c, 0x63, 0xc6, 0x47, 0xe6, 0x00, 0x3e, 0x00, 0x20, 0xff, 0x96, 0x3d, - 0xc9, 0xbf, 0xa2, 0xc5, 0xb3, 0x51, 0xa0, 0xf2, 0xb3, 0x51, 0xa0, 0xbc, 0x13, 0x5a, 0xd4, 0xb7, - 0x29, 0xc1, 0x76, 0xf6, 0xdc, 0x08, 0xa6, 0xe7, 0x98, 0xcc, 0xf4, 0x1c, 0x83, 0x3f, 0x06, 0xdb, - 0xe9, 0xff, 0x03, 0x8c, 0x02, 0x4a, 0xc4, 0x5b, 0x53, 0x4d, 0xef, 0x9e, 0x8c, 0xcb, 0x77, 0x4f, - 0xc6, 0xe1, 0x0f, 0x40, 0x35, 0xc0, 0xcc, 0x88, 0x86, 0x01, 0xf6, 0xc5, 0x33, 0x53, 0x4d, 0xe7, - 0x8d, 0x29, 0x28, 0xcf, 0x1b, 0x53, 0x10, 0x3e, 0x17, 0x66, 0x3d, 0x76, 0xc3, 0xdf, 0x35, 0x72, - 0x97, 0xa9, 0xc1, 0x9c, 0xcb, 0x14, 0xfc, 0xce, 0x29, 0xa8, 0x49, 0x53, 0x24, 0xac, 0x81, 0xad, - 0x61, 0xff, 0x67, 0xfd, 0xd3, 0x9f, 0xf7, 0xeb, 0x2b, 0x7c, 0x71, 0x76, 0xdc, 0x7f, 0x7c, 0xd2, - 0xff, 0x69, 0x5d, 0xe1, 0x8b, 0xc1, 0xb0, 0xdf, 0xe7, 0x8b, 0x55, 0xb8, 0x03, 0xaa, 0xe7, 0xc3, - 0x47, 0x8f, 0x8e, 0x8f, 0x1f, 0x1f, 0x3f, 0xae, 0xaf, 0x41, 0x00, 0x36, 0x7f, 0xd2, 0x3b, 0x79, - 0x76, 0xfc, 0xb8, 0xbe, 0x6e, 0xfc, 0xea, 0xf5, 0x9b, 0x96, 0xf2, 0xd5, 0x9b, 0x96, 0xf2, 0xdf, - 0x37, 0x2d, 0xe5, 0x8b, 0xb7, 0xad, 0x95, 0xaf, 0xde, 0xb6, 0x56, 0xfe, 0xfd, 0xb6, 0xb5, 0xf2, - 0xcb, 0x47, 0xd2, 0x6f, 0x4c, 0xc8, 0x9f, 0x20, 0x1b, 0x79, 0x3e, 0xe5, 0x57, 0x37, 0x5b, 0x75, - 0x6f, 0xf0, 0x63, 0xda, 0x68, 0x53, 0xec, 0xf3, 0xe3, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x4f, - 0xef, 0xf8, 0x20, 0x7a, 0x13, 0x00, 0x00, + 0x4c, 0x44, 0xec, 0x69, 0x5c, 0xb5, 0x22, 0x76, 0xf4, 0xc3, 0x2b, 0x76, 0xd4, 0x2b, 0x5c, 0x18, + 0xd1, 0x59, 0xe6, 0xa0, 0x47, 0xec, 0x3c, 0x50, 0xba, 0xd7, 0x0f, 0xb3, 0xa4, 0xda, 0x68, 0x89, + 0xba, 0xaa, 0x0c, 0x96, 0xea, 0x40, 0x1f, 0xec, 0x07, 0x0c, 0x31, 0x91, 0x73, 0xc6, 0x6a, 0xd3, + 0xb1, 0x05, 0xaf, 0x6b, 0x47, 0xdf, 0xb9, 0x22, 0xd1, 0x73, 0x6e, 0x61, 0x44, 0x29, 0x95, 0x4f, + 0xec, 0x34, 0xaf, 0xdb, 0x59, 0x5e, 0x7b, 0xc1, 0xac, 0x74, 0x30, 0x0f, 0xc0, 0xdf, 0x2b, 0xe0, + 0x76, 0x48, 0xe4, 0x82, 0x15, 0x07, 0xb3, 0x23, 0x02, 0x1f, 0x5d, 0x11, 0x78, 0x28, 0x5b, 0x4d, + 0xeb, 0x9f, 0xc6, 0x6f, 0x65, 0xf1, 0x6f, 0x85, 0x0b, 0x95, 0x06, 0x57, 0xe0, 0xb0, 0x07, 0x76, + 0x42, 0x92, 0x85, 0xe3, 0x12, 0x75, 0xaf, 0xad, 0x1c, 0x56, 0x8c, 0xbb, 0x49, 0xac, 0xdd, 0x9e, + 0x11, 0x48, 0xcc, 0x9a, 0xb5, 0xe0, 0xcd, 0xc1, 0xc7, 0x1e, 0xf5, 0x99, 0x43, 0xc6, 0x26, 0xef, + 0x47, 0x26, 0x8b, 0x3c, 0xac, 0x36, 0xc4, 0x1d, 0x14, 0xcd, 0x61, 0x2a, 0xe6, 0xdb, 0x78, 0x11, + 0x79, 0xb2, 0xb3, 0x46, 0x49, 0x38, 0x6d, 0x9c, 0x70, 0x49, 0xe3, 0xfc, 0x93, 0x02, 0xda, 0x79, + 0xed, 0xcc, 0x30, 0x40, 0x63, 0x71, 0x8e, 0x5f, 0x84, 0x38, 0xc4, 0x82, 0x78, 0xc2, 0xc9, 0x81, + 0x28, 0xe9, 0x7b, 0xe5, 0x92, 0x9e, 0x51, 0xea, 0x3e, 0xe7, 0xba, 0x79, 0x31, 0x8c, 0xfb, 0x49, + 0xac, 0x7d, 0x90, 0x3b, 0x1c, 0x72, 0x7f, 0x46, 0x24, 0x34, 0x7a, 0xc4, 0x3e, 0x9b, 0x4d, 0xe0, + 0xee, 0x35, 0x6a, 0x4d, 0x04, 0x6a, 0xd2, 0xf5, 0x84, 0xef, 0x81, 0xb5, 0x4b, 0x1c, 0x65, 0x3d, + 0xae, 0x91, 0xc4, 0xda, 0xce, 0x25, 0x8e, 0x24, 0x5f, 0x5c, 0x0a, 0xef, 0x83, 0x8d, 0x57, 0xc8, + 0x0d, 0x71, 0xf6, 0x5a, 0x88, 0x66, 0x2f, 0x00, 0xb9, 0xd9, 0x0b, 0xe0, 0xe1, 0xea, 0x03, 0xa5, + 0xf9, 0x17, 0x05, 0x7c, 0x70, 0xa3, 0x0b, 0x23, 0x47, 0xdf, 0xb8, 0x32, 0xfa, 0x89, 0x1c, 0x7d, + 0x79, 0x67, 0x58, 0x96, 0xdd, 0xef, 0x14, 0x70, 0xb0, 0xe8, 0x96, 0xdc, 0xac, 0x14, 0x4f, 0xe4, + 0x64, 0x76, 0x8f, 0xde, 0x2d, 0x27, 0x93, 0x3a, 0x4d, 0x23, 0x2c, 0xcb, 0xe5, 0x0f, 0x0a, 0xb8, + 0x7b, 0xcd, 0xc5, 0xf9, 0x7f, 0xd4, 0xa7, 0xf3, 0x77, 0x05, 0x34, 0x4a, 0xf4, 0x9b, 0xd2, 0x5e, + 0x59, 0x42, 0xfb, 0xfb, 0x60, 0x43, 0x70, 0x5c, 0xa6, 0x8a, 0x00, 0xe4, 0x60, 0x02, 0x80, 0x43, + 0x50, 0x2d, 0x9a, 0xcb, 0xda, 0x8d, 0x72, 0xbf, 0x9d, 0xc4, 0xda, 0xfe, 0xd4, 0x48, 0x72, 0x59, + 0x78, 0xea, 0xfc, 0x76, 0x15, 0x6c, 0xcb, 0x46, 0xf0, 0x33, 0x39, 0x8e, 0x22, 0x6e, 0xdc, 0x47, + 0xd7, 0xc7, 0xd1, 0xe7, 0xfa, 0x57, 0x23, 0xeb, 0x5f, 0x85, 0x1f, 0x29, 0x60, 0xf3, 0x2b, 0x05, + 0xec, 0x5e, 0x7d, 0x6e, 0x57, 0x53, 0xe9, 0xe7, 0xb3, 0xe7, 0xa6, 0x4b, 0xef, 0xf1, 0x74, 0x4c, + 0xd4, 0xbd, 0xcb, 0xb1, 0x78, 0xa0, 0xf3, 0x70, 0xfa, 0xf3, 0x10, 0x11, 0xe6, 0xb0, 0x68, 0xe9, + 0x39, 0x7e, 0xb5, 0x01, 0x1a, 0x4f, 0xe9, 0xe8, 0x3c, 0xdd, 0xa8, 0x43, 0xc6, 0x27, 0xe4, 0x82, + 0xf2, 0x41, 0xc4, 0x75, 0x2e, 0x30, 0x1f, 0x63, 0x45, 0x7a, 0x3b, 0xe9, 0x20, 0x92, 0x63, 0xf2, + 0x20, 0x92, 0x63, 0xf0, 0x21, 0xd8, 0x46, 0xcc, 0x9c, 0xd0, 0x80, 0x99, 0x94, 0x58, 0x69, 0xbe, + 0x15, 0x43, 0x4d, 0x62, 0xed, 0x00, 0xb1, 0x4f, 0x69, 0xc0, 0x4e, 0x89, 0x25, 0x5b, 0x82, 0x02, + 0x85, 0x3f, 0x00, 0x35, 0xcf, 0xc7, 0x1c, 0x77, 0x78, 0x03, 0x5f, 0x13, 0xa6, 0x77, 0x92, 0x58, + 0x7b, 0x47, 0x82, 0x25, 0x5b, 0x59, 0x1b, 0x3e, 0x01, 0x75, 0x8b, 0x12, 0x2b, 0xf4, 0x7d, 0x4c, + 0xac, 0xc8, 0x0c, 0xd0, 0x05, 0x56, 0xd7, 0x85, 0x87, 0x77, 0x93, 0x58, 0xbb, 0x23, 0xc9, 0xce, + 0xd1, 0x85, 0xec, 0x65, 0x6f, 0x4e, 0xc4, 0x9f, 0x81, 0xe9, 0xb3, 0x6f, 0xb9, 0x28, 0x08, 0x4c, + 0x31, 0xb6, 0x6d, 0x16, 0xcf, 0x40, 0x2e, 0x7e, 0xc4, 0xa5, 0xfd, 0xd9, 0x19, 0xae, 0x51, 0x12, + 0xc2, 0x73, 0x50, 0x0b, 0xc2, 0xd1, 0xc4, 0x61, 0xa6, 0x28, 0xe5, 0xd6, 0xd2, 0xf1, 0x2c, 0x1f, + 0x58, 0x40, 0x6a, 0x36, 0x9d, 0x66, 0xa5, 0x35, 0x3f, 0x9c, 0x3c, 0x92, 0x5a, 0x29, 0x0e, 0x27, + 0xc7, 0xe4, 0xc3, 0xc9, 0x31, 0xf8, 0x2b, 0xb0, 0x9f, 0x52, 0xd8, 0xf4, 0xf1, 0x17, 0xa1, 0xe3, + 0xe3, 0x09, 0x2e, 0x66, 0xbc, 0xf7, 0xcb, 0x3c, 0x3f, 0x15, 0x7f, 0x07, 0x92, 0xae, 0xd1, 0x4e, + 0x62, 0xed, 0x1e, 0x2d, 0xe1, 0x52, 0x38, 0x58, 0x96, 0xc2, 0x2e, 0xd8, 0x7a, 0x85, 0xfd, 0xc0, + 0xa1, 0x44, 0xad, 0x8a, 0x5c, 0xdf, 0x49, 0x62, 0xad, 0x91, 0x41, 0x92, 0x6d, 0xae, 0xf5, 0x70, + 0xfd, 0xcf, 0x7f, 0xd5, 0x94, 0xce, 0x1f, 0x15, 0x00, 0xcb, 0x39, 0x40, 0x17, 0xec, 0x79, 0xd4, + 0x96, 0x21, 0x41, 0xcf, 0xda, 0xd1, 0xb7, 0x16, 0x3d, 0x8e, 0x33, 0x8a, 0x29, 0x19, 0xe6, 0xac, + 0x8b, 0x04, 0x9e, 0xac, 0x0c, 0xe6, 0x5d, 0x1b, 0xbb, 0x60, 0x5b, 0xae, 0x56, 0xe7, 0x1f, 0x9b, + 0x60, 0x6f, 0xce, 0x2b, 0x0c, 0xc0, 0x36, 0x9f, 0x17, 0xce, 0xb1, 0x8b, 0x2d, 0x3e, 0xb6, 0xa7, + 0x9d, 0xe3, 0x93, 0xa5, 0xe9, 0x88, 0x71, 0x28, 0xb7, 0x4a, 0xfb, 0x47, 0x93, 0xcf, 0x3e, 0xb2, + 0x33, 0xa9, 0x3c, 0x33, 0x41, 0xe0, 0x19, 0xa8, 0xa0, 0x8b, 0x0b, 0x87, 0x70, 0x06, 0xa4, 0x6d, + 0xe1, 0xde, 0xa2, 0x31, 0xbd, 0x97, 0xe9, 0xa4, 0xfc, 0xc8, 0x2d, 0x64, 0x7e, 0xe4, 0x18, 0x1c, + 0x82, 0x1a, 0xa3, 0x2e, 0xff, 0xb2, 0x74, 0x28, 0xc9, 0x3f, 0xe3, 0x5a, 0x0b, 0x67, 0xff, 0xa9, + 0x9a, 0xb1, 0x9f, 0x91, 0x55, 0x36, 0x1d, 0xc8, 0x0b, 0x48, 0x41, 0x0d, 0x11, 0x42, 0x59, 0xe6, + 0x76, 0xeb, 0xaa, 0xd9, 0x70, 0xbe, 0x38, 0xbd, 0xc2, 0x28, 0xad, 0x8d, 0xe8, 0x05, 0x92, 0x2b, + 0xb9, 0x17, 0x48, 0x30, 0x7c, 0x0a, 0xea, 0x79, 0x6b, 0xa0, 0xe4, 0x8c, 0xba, 0x8e, 0x15, 0x89, + 0xef, 0xc8, 0xaa, 0xd1, 0x4a, 0x62, 0xad, 0x39, 0x2f, 0x93, 0xdc, 0x94, 0xec, 0xe0, 0x6f, 0xc0, + 0x41, 0xde, 0x4f, 0x67, 0x18, 0xb7, 0x29, 0x2a, 0x7e, 0xb8, 0xa8, 0x38, 0x83, 0x05, 0xfa, 0xc6, + 0xbd, 0xac, 0x4c, 0x0b, 0xbd, 0x0d, 0x16, 0xa2, 0xcd, 0x31, 0x68, 0x94, 0x08, 0xf2, 0x8d, 0x4c, + 0x61, 0x17, 0xa0, 0x3e, 0x5f, 0xec, 0x6f, 0x22, 0xce, 0xd3, 0xf5, 0x4a, 0xa5, 0x5e, 0xed, 0xfc, + 0x73, 0x15, 0xd4, 0xf3, 0x9f, 0x1f, 0xce, 0x31, 0xe3, 0x23, 0x73, 0x00, 0x1f, 0x00, 0x90, 0x7f, + 0xcd, 0x9e, 0xe4, 0xdf, 0xd1, 0xe2, 0xd9, 0x28, 0x50, 0xf9, 0xd9, 0x28, 0x50, 0xde, 0x09, 0x2d, + 0xea, 0xdb, 0x94, 0x60, 0x3b, 0x7b, 0x6e, 0x04, 0xd3, 0x73, 0x4c, 0x66, 0x7a, 0x8e, 0xc1, 0x1f, + 0x81, 0xed, 0xf4, 0xff, 0x01, 0x46, 0x01, 0x25, 0xe2, 0xad, 0xa9, 0xa6, 0x77, 0x4f, 0xc6, 0xe5, + 0xbb, 0x27, 0xe3, 0xf0, 0xfb, 0xa0, 0x1a, 0x60, 0x66, 0x44, 0xc3, 0x00, 0xfb, 0xe2, 0x99, 0xa9, + 0xa6, 0xf3, 0xc6, 0x14, 0x94, 0xe7, 0x8d, 0x29, 0x08, 0x9f, 0x0b, 0xb3, 0x1e, 0xbb, 0xe1, 0x2f, + 0x1b, 0xb9, 0xcb, 0xd4, 0x60, 0xce, 0x65, 0x0a, 0x7e, 0x78, 0x0a, 0x6a, 0xd2, 0x14, 0x09, 0x6b, + 0x60, 0x6b, 0xd8, 0xff, 0x69, 0xff, 0xf4, 0x67, 0xfd, 0xfa, 0x0a, 0x5f, 0x9c, 0x1d, 0xf7, 0x1f, + 0x9f, 0xf4, 0x7f, 0x52, 0x57, 0xf8, 0x62, 0x30, 0xec, 0xf7, 0xf9, 0x62, 0x15, 0xee, 0x80, 0xea, + 0xf9, 0xf0, 0xd1, 0xa3, 0xe3, 0xe3, 0xc7, 0xc7, 0x8f, 0xeb, 0x6b, 0x10, 0x80, 0xcd, 0x1f, 0xf7, + 0x4e, 0x9e, 0x1d, 0x3f, 0xae, 0xaf, 0x1b, 0xbf, 0x7c, 0xfd, 0xa6, 0xa5, 0x7c, 0xfd, 0xa6, 0xa5, + 0xfc, 0xe7, 0x4d, 0x4b, 0xf9, 0xf2, 0x6d, 0x6b, 0xe5, 0xeb, 0xb7, 0xad, 0x95, 0x7f, 0xbd, 0x6d, + 0xad, 0xfc, 0xe2, 0x91, 0xf4, 0x2b, 0x13, 0xf2, 0x27, 0xc8, 0x46, 0x9e, 0x4f, 0xf9, 0xd5, 0xcd, + 0x56, 0xdd, 0x1b, 0xfc, 0x9c, 0x36, 0xda, 0x14, 0xfb, 0xfc, 0xe4, 0x7f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x66, 0xab, 0x4c, 0x6e, 0x7c, 0x13, 0x00, 0x00, } func (m *Executor) Marshal() (dAtA []byte, err error) { diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.proto b/internal/scheduler/schedulerobjects/schedulerobjects.proto index c93cfcd6762..d4019c27fad 100644 --- a/internal/scheduler/schedulerobjects/schedulerobjects.proto +++ b/internal/scheduler/schedulerobjects/schedulerobjects.proto @@ -41,7 +41,7 @@ message Node { // Resources available for jobs of a given priority. // E.g., AvailableResources[5]["cpu"] is the amount of CPU available to jobs with priority 5, // where available resources = unused resources + resources assigned to lower-priority jobs. - map allocatable_by_priority_and_resource = 8 [(gogoproto.nullable) = false]; + map allocatable_by_priority_and_resource = 8 [(gogoproto.nullable) = false, deprecated = true]; // Ids of the job runs currently assigned to this node and their current state. map state_by_job_run_id = 9 [(gogoproto.nullable) = false]; // Resource allocated to non-Armada pods on this node. diff --git a/internal/scheduler/scheduling/scheduling_algo.go b/internal/scheduler/scheduling/scheduling_algo.go index 7c70c902881..af40dc61855 100644 --- a/internal/scheduler/scheduling/scheduling_algo.go +++ b/internal/scheduler/scheduling/scheduling_algo.go @@ -218,6 +218,7 @@ func (l *FairSchedulingAlgo) newFairSchedulingAlgoContext(ctx *armadacontext.Con nodeFactory := internaltypes.NewNodeFactory( l.schedulingConfig.IndexedTaints, l.schedulingConfig.IndexedNodeLabels, + l.schedulingConfig.PriorityClasses, l.resourceListFactory, ) diff --git a/internal/scheduler/simulator/simulator.go b/internal/scheduler/simulator/simulator.go index a2059fa317b..0305c4cab57 100644 --- a/internal/scheduler/simulator/simulator.go +++ b/internal/scheduler/simulator/simulator.go @@ -318,6 +318,7 @@ func (s *Simulator) setupClusters() error { nodeFactory := internaltypes.NewNodeFactory(s.schedulingConfig.IndexedTaints, indexedNodeLabels, + s.schedulingConfig.PriorityClasses, s.resourceListFactory) for _, cluster := range s.ClusterSpec.Clusters { @@ -359,10 +360,7 @@ func (s *Simulator) setupClusters() error { nodeTemplate.TotalResources, ), } - dbNode, err := nodeFactory.FromSchedulerObjectsNode(node) - if err != nil { - return err - } + dbNode := nodeFactory.FromSchedulerObjectsNode(node) txn := nodeDb.Txn(true) if err := nodeDb.CreateAndInsertWithJobDbJobsWithTxn(txn, nil, dbNode); err != nil { diff --git a/internal/scheduler/submitcheck.go b/internal/scheduler/submitcheck.go index 49bee2d2786..d96fd740c2e 100644 --- a/internal/scheduler/submitcheck.go +++ b/internal/scheduler/submitcheck.go @@ -113,6 +113,7 @@ func (srv *SubmitChecker) updateExecutors(ctx *armadacontext.Context) { nodeFactory := internaltypes.NewNodeFactory( srv.schedulingConfig.IndexedTaints, srv.schedulingConfig.IndexedNodeLabels, + srv.schedulingConfig.PriorityClasses, srv.resourceListFactory) executorsByPoolAndId := map[string]map[string]*executor{} diff --git a/internal/scheduler/testfixtures/testfixtures.go b/internal/scheduler/testfixtures/testfixtures.go index 902e5a1054d..d27755b2650 100644 --- a/internal/scheduler/testfixtures/testfixtures.go +++ b/internal/scheduler/testfixtures/testfixtures.go @@ -102,7 +102,7 @@ var ( Taints: []v1.Taint{{Key: "largeJobsOnly", Value: "true", Effect: v1.TaintEffectNoSchedule}}, }, } - TestNodeFactory = internaltypes.NewNodeFactory(TestIndexedTaints, TestIndexedNodeLabels, TestResourceListFactory) + TestNodeFactory = internaltypes.NewNodeFactory(TestIndexedTaints, TestIndexedNodeLabels, TestPriorityClasses, TestResourceListFactory) jobTimestamp atomic.Int64 // SchedulingKeyGenerator to use in testing. // Has to be consistent since creating one involves generating a random key.