[Refactor][RayCluster] Unify status update to single place #2249
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
MortalHappiness
force-pushed
the
feature/#2235-refacter-raycluster-status
branch
from
157ea19
to
fad4424
Compare
kevin85421
reviewed
Jul 17, 2024
| // reconcileServeService | ||
| func(ctx context.Context, instance *rayv1.RayCluster) error { | ||
| // Only reconcile the K8s service for Ray Serve when the "ray.io/enable-serve-service" annotation is set to true. | ||
| if enableServeServiceValue, exist := instance.Annotations[utils.EnableServeServiceKey]; exist && enableServeServiceValue == utils.EnableServeServiceTrue { |
There was a problem hiding this comment.
How about checking this inside reconcileServeService?
| } | ||
| return nil | ||
| }, | ||
| // reconcilePods |
There was a problem hiding this comment.
How about using r.reconcilePods directly? We can remove the event for now.
|
|
||
| for _, fn := range reconcileFuncs { | ||
| if reconcileErr = fn(ctx, instance); reconcileErr != nil { | ||
| break |
Resolves: ray-project#2235 Signed-off-by: Chi-Sheng Liu <chishengliu@chishengliu.com>
Resolves: ray-project#2235 Signed-off-by: Chi-Sheng Liu <chishengliu@chishengliu.com>
Resolves: ray-project#2235 Signed-off-by: Chi-Sheng Liu <chishengliu@chishengliu.com>
MortalHappiness
force-pushed
the
feature/#2235-refacter-raycluster-status
branch
from
fad4424
to
0719b3a
Compare
Should these tests be added in this PR? This PR is for refactoring purpose. It might be better to add these tests in a separate PR. |
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.
Why are these changes needed?
See the description in the corresponding issue for details.
Implementation details of this PR:
updateClusterStateandupdateClusterReasonfunctions are integrated into a single functionupdateRayClusterStatus.inconsistentRayClusterStatuschecking is moved intoupdateRayClusterStatus, so that the status will only be updated if it is inconsistent.calculateStatusfunction takes one more argument calledreconcileErr. If it is a non-nil value, then theStatus.Statewill be set toFailedandStatus.Reasonwill be set to the string representation of the error.reconcileErrvariable for processing later.Related issue number
Resolves: #2235
Checks