Bug fix: Add the child domains properly to the parent when calculating the topology tree in the scheduler (#396)

Author: davidLif

pkg/scheduler/actions/common/allocate.go

@@ -26,6 +26,8 @@ func AllocateJob(ssn *framework.Session, stmt *framework.Statement, nodes []*nod
 		}
 		return false
 	}
+
+	defer ssn.CleanAllocationAttemptCache(job)
 	cp := stmt.Checkpoint()
 	for index, task := range tasksToAllocate {
 		success := allocateTask(ssn, stmt, nodes, task, isPipelineOnly)
@@ -73,8 +75,6 @@ func allocateTask(ssn *framework.Session, stmt *framework.Statement, nodes []*no
 			task.Namespace, task.Name, node.Name)
 	}
 
-	ssn.CleanAllocationAttemptCache(job)
-
 	if success {
 		log.InfraLogger.V(6).Infof("Allocation succeeded for task: <%v/%v>", task.Namespace, task.Name)
 	} else {

pkg/scheduler/plugins/topology/topology_plugin.go

@@ -97,11 +97,11 @@ func (*topologyPlugin) addNodeDataToTopology(topologyTree *TopologyInfo, singleT
 
 		// Connect the child domain to the current domain. The current node gives us the link
 		if nodeContainingChildDomain != nil {
-			nodeContainingChildDomain.Parent = domainInfo
+			connectDomainToParent(nodeContainingChildDomain, domainInfo)
 		}
 		nodeContainingChildDomain = domainInfo
 	}
-	nodeContainingChildDomain.Parent = topologyTree.Root
+	connectDomainToParent(nodeContainingChildDomain, topologyTree.Root)
 	topologyTree.Root.AddNode(nodeInfo)
 }
 

pkg/scheduler/plugins/topology/topology_plugin_job_filtering.go

@@ -6,7 +6,6 @@ package topology
 import (
 	"errors"
 	"fmt"
-	"slices"
 	"sort"
 	"strings"
 
@@ -242,7 +241,8 @@ func (*topologyPlugin) calculateRelevantDomainLevels(
 	foundPreferredLevel := false
 	relevantLevels := []string{}
 	abovePreferredLevel := preferredPlacement == ""
-	for _, level := range topologyTree.TopologyResource.Spec.Levels {
+	for i := len(topologyTree.TopologyResource.Spec.Levels) - 1; i >= 0; i-- {
+		level := topologyTree.TopologyResource.Spec.Levels[i]
 		if preferredPlacement != "" && preferredPlacement == level.NodeLabel {
 			foundPreferredLevel = true
 			abovePreferredLevel = true
@@ -286,7 +286,10 @@ func (t *topologyPlugin) improveChoiceForPreference(maxDepthDomains []*TopologyD
 }
 
 func getJobAllocatableChildrenSubset(domain *TopologyDomainInfo, taskToAllocateCount int) []*TopologyDomainInfo {
-	children := slices.Clone(domain.Children)
+	children := make([]*TopologyDomainInfo, 0, len(domain.Children))
+	for _, child := range domain.Children {
+		children = append(children, child)
+	}
 	sort.SliceStable(children, func(i, j int) bool {
 		return children[i].AllocatablePods > children[j].AllocatablePods
 	})