Merge branch 'fixrunningnum' into 'master'

if running pod greater or equal to MinAvailable then set job phase running See merge request CBU-PaaS/Community/volcano/volcano!34
wangyuqing4 · Feb 20, 2019 · 8e90652 · 8e90652
2 parents e712460 + 98e87fa
commit 8e90652
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pkg/apis/batch/v1alpha1/job.go b/pkg/apis/batch/v1alpha1/job.go
@@ -163,7 +163,7 @@ const (
 	Running JobPhase = "Running"
 	// Restarting is the phase that the Job is restarted, waiting for pod releasing and recreating
 	Restarting JobPhase = "Restarting"
-	// Completed is the phase that all tasks of Job are completed successfully
+	// Completed is the phase that all tasks of Job are completed
 	Completed JobPhase = "Completed"
 	// Terminating is the phase that the Job is terminated, waiting for releasing pods
 	Terminating JobPhase = "Terminating"

diff --git a/pkg/controllers/job/state/pending.go b/pkg/controllers/job/state/pending.go
@@ -52,10 +52,9 @@ func (ps *pendingState) Execute(action vkv1.Action) error {
 		})
 	default:
 		return SyncJob(ps.job, func(status vkv1.JobStatus) vkv1.JobState {
-			total := totalTasks(ps.job.Job)
 			phase := vkv1.Pending
 
-			if total == status.Running {
+			if ps.job.Job.Spec.MinAvailable <= status.Running {
 				phase = vkv1.Running
 			}
 			return vkv1.JobState{