Rename getActiveSubGroupInfos to GetSubGroups

Author: omer-dayan

pkg/scheduler/api/cluster_info.go

@@ -96,7 +96,7 @@ func (ci ClusterInfo) String() string {
 			str = str + fmt.Sprintf("\t Job(%s) name(%s) minAvailable(%v)\n",
 				job.UID, job.Name, job.GetDefaultMinAvailable())
 
-			for _, subGroup := range job.GetActiveSubGroupInfos() {
+			for _, subGroup := range job.GetSubGroups() {
 				str = str + fmt.Sprintf("\t\t subGroup(%s), minAvailable(%v)\n",
 					subGroup.GetName(), subGroup.GetMinAvailable())
 			}

pkg/scheduler/api/podgroup_info/allocation_info.go

@@ -35,7 +35,7 @@ func GetTasksToAllocate(
 	priorityQueueMap := getTasksPriorityQueuePerSubGroup(podGroupInfo, taskOrderFn, isRealAllocation)
 	maxNumOfTasksToAllocateMap := getNumTasksToAllocatePerSubGroup(podGroupInfo, isRealAllocation)
 
-	subGroupPriorityQueue := getSubGroupsPriorityQueue(podGroupInfo.GetActiveSubGroupInfos(), subGroupOrderFn)
+	subGroupPriorityQueue := getSubGroupsPriorityQueue(podGroupInfo.GetSubGroups(), subGroupOrderFn)
 	maxNumOfSubGroups := getNumOfSubGroupsToAllocate(podGroupInfo)
 	numAllocatedSubGroups := 0
 
@@ -111,7 +111,7 @@ func getTasksPriorityQueuePerSubGroup(
 	podGroupInfo *PodGroupInfo, taskOrderFn common_info.LessFn, isRealAllocation bool,
 ) map[string]*scheduler_util.PriorityQueue {
 	priorityQueuesMap := map[string]*scheduler_util.PriorityQueue{}
-	for name, subGroup := range podGroupInfo.GetActiveSubGroupInfos() {
+	for name, subGroup := range podGroupInfo.GetSubGroups() {
 		priorityQueue := scheduler_util.NewPriorityQueue(taskOrderFn, scheduler_util.QueueCapacityInfinite)
 		for _, task := range subGroup.podInfos {
 			if task.ShouldAllocate(isRealAllocation) {
@@ -134,7 +134,7 @@ func getSubGroupsPriorityQueue(subGroups map[string]*SubGroupInfo,
 
 func getNumTasksToAllocatePerSubGroup(podGroupInfo *PodGroupInfo, isRealAllocation bool) map[string]int {
 	maxTasksToAllocate := map[string]int{}
-	for name, subGroup := range podGroupInfo.GetActiveSubGroupInfos() {
+	for name, subGroup := range podGroupInfo.GetSubGroups() {
 		numAllocatedTasks := subGroup.GetNumActiveAllocatedTasks()
 		if numAllocatedTasks >= int(subGroup.minAvailable) {
 			numTasksToAllocate := getNumAllocatableTasks(subGroup, isRealAllocation)
@@ -157,7 +157,7 @@ func getNumAllocatableTasks(subGroup *SubGroupInfo, isRealAllocation bool) int {
 }
 
 func getNumOfSubGroupsToAllocate(podGroupInfo *PodGroupInfo) int {
-	for _, subGroup := range podGroupInfo.GetActiveSubGroupInfos() {
+	for _, subGroup := range podGroupInfo.GetSubGroups() {
 		allocatedTasks := subGroup.GetNumActiveAllocatedTasks()
 		if allocatedTasks >= int(subGroup.GetMinAvailable()) {
 			return 1

pkg/scheduler/api/podgroup_info/eviction_info.go

@@ -24,7 +24,7 @@ func GetTasksToEvict(job *PodGroupInfo, subGroupOrderFn, taskOrderFn common_info
 func getTasksToEvictWithSubGroups(
 	job *PodGroupInfo, reverseSubGroupOrderFn, reverseTaskOrderFn common_info.LessFn,
 ) ([]*pod_info.PodInfo, bool) {
-	subGroupPriorityQueue := getSubGroupsPriorityQueue(job.GetActiveSubGroupInfos(), reverseSubGroupOrderFn)
+	subGroupPriorityQueue := getSubGroupsPriorityQueue(job.GetSubGroups(), reverseSubGroupOrderFn)
 	maxNumOfSubGroups := getNumOfSubGroupsToEvict(job)
 
 	var tasksToEvict []*pod_info.PodInfo

pkg/scheduler/api/podgroup_info/job_info.go

@@ -133,7 +133,7 @@ func (pgi *PodGroupInfo) GetAllPodsMap() pod_info.PodsMap {
 	return allPods
 }
 
-func (pgi *PodGroupInfo) GetActiveSubGroupInfos() map[string]*SubGroupInfo {
+func (pgi *PodGroupInfo) GetSubGroups() map[string]*SubGroupInfo {
 	return pgi.SubGroups
 }
 
@@ -384,7 +384,7 @@ func (pgi *PodGroupInfo) GetTasksActiveAllocatedReqResource() *resource_info.Res
 }
 
 func (pgi *PodGroupInfo) IsReadyForScheduling() bool {
-	for _, subGroup := range pgi.GetActiveSubGroupInfos() {
+	for _, subGroup := range pgi.GetSubGroups() {
 		if !subGroup.IsReadyForScheduling() {
 			return false
 		}
@@ -405,7 +405,7 @@ func (pgi *PodGroupInfo) IsStale() bool {
 	if totalActivePods == 0 {
 		return false
 	}
-	for _, subGroup := range pgi.GetActiveSubGroupInfos() {
+	for _, subGroup := range pgi.GetSubGroups() {
 		if !subGroup.IsGangSatisfied() {
 			return true
 		}
@@ -484,7 +484,7 @@ func (pgi *PodGroupInfo) CloneWithTasks(tasks []*pod_info.PodInfo) *PodGroupInfo
 func (pgi *PodGroupInfo) String() string {
 	res := ""
 
-	for _, subGroup := range pgi.GetActiveSubGroupInfos() {
+	for _, subGroup := range pgi.GetSubGroups() {
 		res = res + fmt.Sprintf("\t\t subGroup %s: minAvailable(%v)\n",
 			subGroup.name, subGroup.minAvailable)
 	}

pkg/scheduler/cache/cluster_info/cluster_info_test.go

@@ -1227,9 +1227,9 @@ func TestSnapshotPodGroups(t *testing.T) {
 			assert.Equal(t, expected.Queue, pg.Queue)
 			assert.Equal(t, expected.GetDefaultMinAvailable(), pg.GetDefaultMinAvailable())
 
-			assert.Equal(t, len(expected.GetActiveSubGroupInfos()), len(pg.GetActiveSubGroupInfos()))
-			for _, expectedSubGroup := range expected.GetActiveSubGroupInfos() {
-				for _, subGroup := range pg.GetActiveSubGroupInfos() {
+			assert.Equal(t, len(expected.GetSubGroups()), len(pg.GetSubGroups()))
+			for _, expectedSubGroup := range expected.GetSubGroups() {
+				for _, subGroup := range pg.GetSubGroups() {
 					if expectedSubGroup.GetName() != subGroup.GetName() {
 						continue
 					}

pkg/scheduler/cache/status_updater/default_status_updater.go

@@ -247,7 +247,7 @@ func (su *defaultStatusUpdater) recordStaleJobEvent(job *podgroup_info.PodGroupI
 
 	totalActivePods := 0
 	totalMinAvailable := int32(0)
-	for _, subGroup := range job.GetActiveSubGroupInfos() {
+	for _, subGroup := range job.GetSubGroups() {
 		activeTasks := subGroup.GetNumActiveUsedTasks()
 		minAvailable := subGroup.GetMinAvailable()
 		totalActivePods += activeTasks
@@ -266,7 +266,7 @@ func (su *defaultStatusUpdater) recordStaleJobEvent(job *podgroup_info.PodGroupI
 
 func (su *defaultStatusUpdater) recordJobNotReadyEvent(job *podgroup_info.PodGroupInfo) {
 	message := fmt.Sprintf("Job is not ready for scheduling.")
-	for _, subGroup := range job.GetActiveSubGroupInfos() {
+	for _, subGroup := range job.GetSubGroups() {
 		if !subGroup.IsReadyForScheduling() {
 			if subGroup.GetName() == podgroup_info.DefaultSubGroup {
 				message = message + fmt.Sprintf(" Waiting for %d pods, currently %d exist, %d are gated",