Fix a bug that XGBoostJob's running condition isn't updated when the job is resumed #1866
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tenzen-y
commented
Jul 21, 2023
| commonutil "github.com/kubeflow/training-operator/pkg/util" | ||
| ) | ||
|
|
||
| func setRunningCondition(logger *logrus.Entry, jobName string, jobStatus *kubeflowv1.JobStatus) error { |
There was a problem hiding this comment.
This function doesn't need since we can do the same process using the commonutil.UpdateJobConditions.
Pull Request Test Coverage Report for Build 5622818786
💛 - Coveralls |
tenzen-y
commented
Jul 21, 2023
Comment on lines
+334
to
+357
| By("Checking if the XGBoostJob has resumed conditions") | ||
| Eventually(func() []kubeflowv1.JobCondition { | ||
| Expect(testK8sClient.Get(ctx, jobKey, created)).Should(Succeed()) | ||
| return created.Status.Conditions | ||
| }, testutil.Timeout, testutil.Interval).Should(BeComparableTo([]kubeflowv1.JobCondition{ | ||
| { | ||
| Type: kubeflowv1.JobCreated, | ||
| Status: corev1.ConditionTrue, | ||
| Reason: commonutil.NewReason(kubeflowv1.XGBoostJobKind, commonutil.JobCreatedReason), | ||
| Message: fmt.Sprintf("XGBoostJob %s is created.", name), | ||
| }, | ||
| { | ||
| Type: kubeflowv1.JobSuspended, | ||
| Reason: commonutil.NewReason(kubeflowv1.XGBoostJobKind, commonutil.JobResumedReason), | ||
| Message: fmt.Sprintf("XGBoostJob %s is resumed.", name), | ||
| Status: corev1.ConditionFalse, | ||
| }, | ||
| { | ||
| Type: kubeflowv1.JobRunning, | ||
| Status: corev1.ConditionTrue, | ||
| Reason: commonutil.NewReason(kubeflowv1.XGBoostJobKind, commonutil.JobRunningReason), | ||
| Message: fmt.Sprintf("XGBoostJob %s is running.", name), | ||
| }, | ||
| }, testutil.IgnoreJobConditionsTimes)) |
There was a problem hiding this comment.
Before applying this PR fixing, this case failed.
tenzen-y
force-pushed
the
implement-supend-test-for-xgboostjob
branch
2 times, most recently
from
547a2fa
to
533d7be
Compare
…job is resumed Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
tenzen-y
force-pushed
the
implement-supend-test-for-xgboostjob
branch
from
533d7be
to
b2fe124
Compare
|
/assign @terrytangyuan @johnugeorge |
|
@terrytangyuan Thanks for the review. Could you give |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: tenzen-y, terrytangyuan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
I fixed a bug that XGBoostJob's running condition isn't updated when the job is resumed.
Also, I implemented integration test for XGBoostJob related to suspend semantics.
follow-up: #1859
Which issue(s) this PR fixes (optional, in
Fixes #<issue number>, #<issue number>, ...format, will close the issue(s) when PR gets merged):Fixes #
Checklist: