Merge pull request #480 from k82cn/add_pipelined_pods

k8s-ci-robot · web-flow · commit f5d599648ef4 · 2018-11-23T19:41:09.000-08:00
Added Pipelined Pods as valid tasks.
diff --git a/pkg/scheduler/plugins/gang/gang.go b/pkg/scheduler/plugins/gang/gang.go
@@ -35,6 +35,7 @@ func New(args *framework.PluginArgs) framework.Plugin {
 	}
 }
 
+// readyTaskNum return the number of tasks that are ready to run.
 func readyTaskNum(job *api.JobInfo) int32 {
 	occupid := 0
 	for status, tasks := range job.TaskStatusIndex {
@@ -46,11 +47,13 @@ func readyTaskNum(job *api.JobInfo) int32 {
 	return int32(occupid)
 }
 
+// validTaskNum return the number of tasks that are valid.
 func validTaskNum(job *api.JobInfo) int32 {
 	occupid := 0
 	for status, tasks := range job.TaskStatusIndex {
 		if api.AllocatedStatus(status) ||
 			status == api.Succeeded ||
+			status == api.Pipelined ||
 			status == api.Pending {
 			occupid = occupid + len(tasks)
 		}

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ func New(args *framework.PluginArgs) framework.Plugin {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
	`38`	`+// readyTaskNum return the number of tasks that are ready to run.`
`38`	`39`	`func readyTaskNum(job *api.JobInfo) int32 {`
`39`	`40`	`occupid := 0`
`40`	`41`	`for status, tasks := range job.TaskStatusIndex {`
`@@ -46,11 +47,13 @@ func readyTaskNum(job *api.JobInfo) int32 {`
`46`	`47`	`return int32(occupid)`
`47`	`48`	`}`
`48`	`49`
	`50`	`+// validTaskNum return the number of tasks that are valid.`
`49`	`51`	`func validTaskNum(job *api.JobInfo) int32 {`
`50`	`52`	`occupid := 0`
`51`	`53`	`for status, tasks := range job.TaskStatusIndex {`
`52`	`54`	`if api.AllocatedStatus(status) \|\|`
`53`	`55`	`status == api.Succeeded \|\|`
	`56`	`+ status == api.Pipelined \|\|`
`54`	`57`	`status == api.Pending {`
`55`	`58`	`occupid = occupid + len(tasks)`
`56`	`59`	`}`