Skip to content
This repository has been archived by the owner on Feb 1, 2022. It is now read-only.

fix successPolicy logic #85

Merged
merged 3 commits into from Jul 31, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion pkg/controller.v1beta1/mxnet/status.go
Expand Up @@ -63,7 +63,7 @@ func updateStatusSingle(mxjob *mxv1beta1.MXJob, rtype mxv1beta1.MXReplicaType, r
return err
}
}
if expected == 0 {
if expected == 0 && *mxjob.Spec.SuccessPolicy != mxv1beta1.SuccessPolicyAllWorkers {
msg := fmt.Sprintf("MXJob %s is successfully completed.", mxjob.Name)
if mxjob.Status.CompletionTime == nil {
now := metav1.Now()
Expand All @@ -75,6 +75,14 @@ func updateStatusSingle(mxjob *mxv1beta1.MXJob, rtype mxv1beta1.MXReplicaType, r
return err
}
}
if expected == 0 && *mxjob.Spec.SuccessPolicy == mxv1beta1.SuccessPolicyAllWorkers {
msg := fmt.Sprintf("MXJob %s is running.", mxjob.Name)
err := updateMXJobConditions(mxjob, mxv1beta1.MXJobRunning, mxJobRunningReason, msg)
if err != nil {
mxlogger.LoggerForJob(mxjob).Infof("Append mxjob condition error: %v", err)
return err
}
}
} else if rtype == mxv1beta1.MXReplicaTypeWorker {
if expected == 0 && *mxjob.Spec.SuccessPolicy == mxv1beta1.SuccessPolicyAllWorkers {
msg := fmt.Sprintf("MXJob %s is successfully completed.", mxjob.Name)
Expand Down
16 changes: 16 additions & 0 deletions pkg/controller.v1beta1/mxnet/status_test.go
Expand Up @@ -200,6 +200,22 @@ func TestStatus(t *testing.T) {
schedulerCompleted: false,
expectedType: mxv1beta1.MXJobRunning,
},
{
description: "Scheduler is succeeded, worker is running, successPolicy sets to AllWorkers",
mxJob: testutil.NewMXJobWithSuccessPolicy(1, 1, 0, mxv1beta1.SuccessPolicyAllWorkers),
expectedFailedScheduler: 0,
expectedSucceededScheduler: 1,
expectedActiveScheduler: 0,
expectedFailedWorker: 0,
expectedSucceededWorker: 0,
expectedActiveWorker: 1,
expectedFailedServer: 0,
expectedSucceededServer: 0,
expectedActiveServer: 0,
restart: false,
schedulerCompleted: true,
expectedType: mxv1beta1.MXJobRunning,
},
}

for i, c := range testCases {
Expand Down