Scheduler: remove unused fields on schedulerobjects.Node (#3787)

Signed-off-by: Robert Smith <[email protected]>

internal/scheduler/nodedb/nodedb.go

@@ -67,11 +67,6 @@ func (nodeDb *NodeDb) create(node *schedulerobjects.Node) (*internaltypes.Node,
 	}
 	allocatableByPriority[evictedPriority] = allocatableByPriority[minimumPriority]
 
-	evictedJobRunIds := node.EvictedJobRunIds
-	if evictedJobRunIds == nil {
-		evictedJobRunIds = make(map[string]bool)
-	}
-
 	nodeDb.mu.Lock()
 	for key := range nodeDb.indexedNodeLabels {
 		if value, ok := labels[key]; ok {
@@ -96,9 +91,9 @@ func (nodeDb *NodeDb) create(node *schedulerobjects.Node) (*internaltypes.Node,
 		labels,
 		nodeDb.resourceListFactory.FromNodeProto(totalResources.Resources),
 		allocatableByPriority,
-		fromMapKToJobResourcesIgnoreUnknown(nodeDb.resourceListFactory, node.AllocatedByQueue),
-		fromMapKToJobResourcesIgnoreUnknown(nodeDb.resourceListFactory, node.AllocatedByJobId),
-		evictedJobRunIds,
+		map[string]internaltypes.ResourceList{},
+		map[string]internaltypes.ResourceList{},
+		map[string]bool{},
 		nil), nil
 }
 
@@ -110,15 +105,6 @@ func (nodeDb *NodeDb) copyMapWithIntern(labels map[string]string) map[string]str
 	return result
 }
 
-// Ignore unknown resources, round up.
-func fromMapKToJobResourcesIgnoreUnknown[K comparable](factory *internaltypes.ResourceListFactory, m map[K]schedulerobjects.ResourceList) map[K]internaltypes.ResourceList {
-	result := make(map[K]internaltypes.ResourceList, len(m))
-	for k, v := range m {
-		result[k] = factory.FromJobResourceListIgnoreUnknown(v.Resources)
-	}
-	return result
-}
-
 func (nodeDb *NodeDb) CreateAndInsertWithJobDbJobsWithTxn(txn *memdb.Txn, jobs []*jobdb.Job, node *schedulerobjects.Node) error {
 	entry, err := nodeDb.create(node)
 	if err != nil {

internal/scheduler/schedulerobjects/node.go

@@ -26,9 +26,6 @@ func (node *Node) DeepCopy() *Node {
 			node.AllocatableByPriorityAndResource,
 		).DeepCopy(),
 		StateByJobRunId:             maps.Clone(node.StateByJobRunId),
-		AllocatedByJobId:            armadamaps.DeepCopy(node.AllocatedByJobId),
-		AllocatedByQueue:            armadamaps.DeepCopy(node.AllocatedByQueue),
-		EvictedJobRunIds:            maps.Clone(node.EvictedJobRunIds),
 		NonArmadaAllocatedResources: armadamaps.DeepCopy(node.NonArmadaAllocatedResources),
 		Unschedulable:               node.Unschedulable,
 	}