Refactored DeleteTaskInfo (#345)

Author: romanbaron

pkg/scheduler/api/podgroup_info/job_info.go

@@ -195,8 +195,8 @@ func (pgi *PodGroupInfo) AddTaskInfo(ti *pod_info.PodInfo) {
 }
 
 func (pgi *PodGroupInfo) UpdateTaskStatus(task *pod_info.PodInfo, status pod_status.PodStatus) error {
-	// Remove the task from the task list firstly
-	if err := pgi.DeleteTaskInfo(task); err != nil {
+	// Reset the task state
+	if err := pgi.resetTaskState(task); err != nil {
 		return err
 	}
 
@@ -250,7 +250,7 @@ func (pgi *PodGroupInfo) GetActivelyRunningTasksCount() int32 {
 	return tasksCount
 }
 
-func (pgi *PodGroupInfo) DeleteTaskInfo(ti *pod_info.PodInfo) error {
+func (pgi *PodGroupInfo) resetTaskState(ti *pod_info.PodInfo) error {
 	task, found := pgi.PodInfos[ti.UID]
 	if !found {
 		return fmt.Errorf("failed to find task <%v/%v> in job <%v>",
@@ -262,9 +262,6 @@ func (pgi *PodGroupInfo) DeleteTaskInfo(ti *pod_info.PodInfo) error {
 	}
 
 	pgi.deleteTaskIndex(ti)
-	taskClone := task.Clone()
-	taskClone.Status = pod_status.Deleted
-	pgi.PodInfos[taskClone.UID] = taskClone
 	return nil
 
 }

pkg/scheduler/api/podgroup_info/job_info_test.go

@@ -128,8 +128,6 @@ func TestDeleteTaskInfo(t *testing.T) {
 	case01_task2 := pod_info.NewTaskInfo(case01_pod2)
 	case01_pod3 := common_info.BuildPod(case01_ns, "p3", "n1", v1.PodRunning, common_info.BuildResourceList("3000m", "3G"), []metav1.OwnerReference{case01_owner}, make(map[string]string), runningPodAnnotations)
 	case01_task3 := pod_info.NewTaskInfo(case01_pod3)
-
-	case01_task2.Status = pod_status.Deleted
 	// case2
 	case02_uid := common_info.PodGroupID("owner2")
 	case02_ns := "c2"
@@ -142,8 +140,6 @@ func TestDeleteTaskInfo(t *testing.T) {
 	case02_pod3 := common_info.BuildPod(case02_ns, "p3", "n1", v1.PodRunning, common_info.BuildResourceList("3000m", "3G"), []metav1.OwnerReference{case02_owner}, make(map[string]string), runningPodAnnotations)
 	case02_task3 := pod_info.NewTaskInfo(case02_pod3)
 
-	case02_task2.Status = pod_status.Deleted
-
 	tests := []struct {
 		name     string
 		uid      common_info.PodGroupID
@@ -212,7 +208,7 @@ func TestDeleteTaskInfo(t *testing.T) {
 		for _, pod := range test.rmPods {
 			pi := pod_info.NewTaskInfo(pod)
 			//nolint:golint,errcheck
-			ps.DeleteTaskInfo(pi)
+			ps.resetTaskState(pi)
 		}
 
 		if !jobInfoEqual(ps, test.expected) {