[Fix][RayCluster] Make the RayClusterReplicaFailureReason to capture the correct reason #2282
Conversation
This file contains hidden or 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
…the correct reason Signed-off-by: Rueian <rueiancsie@gmail.com>
rueian
commented
Aug 3, 2024
| @@ -1707,7 +1708,7 @@ func TestCalculateStatus(t *testing.T) { | |||
| assert.Equal(t, newInstance.Status.LastUpdateTime, newInstance.Status.StateTransitionTimes[rayv1.Ready]) | |||
|
|
|||
| // Test reconcilePodsErr with the feature gate disabled | |||
| newInstance, err = r.calculateStatus(ctx, testRayCluster, utils.ErrFailedCreateHeadPod) | |||
| newInstance, err = r.calculateStatus(ctx, testRayCluster, errors.Join(utils.ErrFailedCreateHeadPod, errors.New("invalid"))) | |||
There was a problem hiding this comment.
Align how we wrap the error in the reconcilePods.
| @@ -1740,7 +1741,7 @@ func TestCalculateStatus(t *testing.T) { | |||
| assert.True(t, meta.IsStatusConditionPresentAndEqual(newInstance.Status.Conditions, string(rayv1.HeadPodReady), metav1.ConditionFalse)) | |||
|
|
|||
| // Test reconcilePodsErr with the feature gate enabled | |||
| newInstance, err = r.calculateStatus(ctx, testRayCluster, utils.ErrFailedCreateHeadPod) | |||
| newInstance, err = r.calculateStatus(ctx, testRayCluster, errors.Join(utils.ErrFailedCreateHeadPod, errors.New("invalid"))) | |||
There was a problem hiding this comment.
Align how we wrap the error in the reconcilePods.
4 tasks
kevin85421
approved these changes
Aug 3, 2024
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.
@MortalHappiness found the previous implementation of
RayClusterReplicaFailureReasonfailed to capture condition reasons correctly. It made a wrong positional assumption on the error tree passed in so it failed in integration.This PR removes the wrong assumption by using the
errors.Asfunction which traverses the whole tree and finds the first target by the specified pointer type (i.e. the *errRayClusterReplicaFailure). TheRayClusterReplicaFailureReasoncan now return the correct condition reason no matter how the error is wrapped.FailedCreateHeadPod Example:
Checks