From 7844b4299443de28a6152bfeaebe79b30ecc6d4c Mon Sep 17 00:00:00 2001 From: xuzhonghu Date: Thu, 30 Apr 2020 15:35:09 +0800 Subject: [PATCH] Fix phase transition time set --- pkg/controllers/job/state/aborting.go | 3 --- pkg/controllers/job/state/pending.go | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/controllers/job/state/aborting.go b/pkg/controllers/job/state/aborting.go index 4524477e82..eaccdf11b5 100644 --- a/pkg/controllers/job/state/aborting.go +++ b/pkg/controllers/job/state/aborting.go @@ -17,7 +17,6 @@ limitations under the License. package state import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "volcano.sh/volcano/pkg/apis/bus/v1alpha1" vcbatch "volcano.sh/volcano/pkg/apis/batch/v1alpha1" @@ -43,9 +42,7 @@ func (ps *abortingState) Execute(action v1alpha1.Action) error { return false } status.State.Phase = vcbatch.Aborted - status.State.LastTransitionTime = metav1.Now() return true - }) } } diff --git a/pkg/controllers/job/state/pending.go b/pkg/controllers/job/state/pending.go index 550042c526..9e56c99eab 100644 --- a/pkg/controllers/job/state/pending.go +++ b/pkg/controllers/job/state/pending.go @@ -54,8 +54,9 @@ func (ps *pendingState) Execute(action v1alpha1.Action) error { return SyncJob(ps.job, func(status *vcbatch.JobStatus) bool { if ps.job.Job.Spec.MinAvailable <= status.Running+status.Succeeded+status.Failed { status.State.Phase = vcbatch.Running + return true } - return true + return false }) } }