[RayService] Add a safeguard to prevent overriding the pending cluster during a upgrade #2887
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
rueian
force-pushed
the
rayservice-upgrade-safeguard
branch
from
3fcc4a7 to
9ca4b4a
Compare
kevin85421
reviewed
Feb 4, 2025
| @@ -243,6 +243,7 @@ func (r *RayServiceReconciler) calculateStatus(ctx context.Context, rayServiceIn | |||
| rayServiceInstance.Status.ActiveServiceStatus.Applications = activeClusterServeApplications | |||
| rayServiceInstance.Status.PendingServiceStatus.Applications = pendingClusterServeApplications | |||
|
|
|||
| var servingClusterName string | |||
There was a problem hiding this comment.
Maybe use a boolean to indicate whether the services point to the pending cluster instead?
There was a problem hiding this comment.
Done, but I think using a Boolean feels like leaving the actual check outside of the shouldXXX function.
rueian
force-pushed
the
rayservice-upgrade-safeguard
branch
3 times, most recently
from
8e02563 to
2311404
Compare
kevin85421
reviewed
Feb 5, 2025
| assert.True(t, shouldPrepareNewCluster) | ||
| } | ||
|
|
||
| func TestShouldPrepareNewCluster_RecreatePendingCluster(t *testing.T) { |
There was a problem hiding this comment.
These two tests look pretty similar how about merging it into one test with t.Run(...).
| @@ -243,6 +243,7 @@ func (r *RayServiceReconciler) calculateStatus(ctx context.Context, rayServiceIn | |||
| rayServiceInstance.Status.ActiveServiceStatus.Applications = activeClusterServeApplications | |||
| rayServiceInstance.Status.PendingServiceStatus.Applications = pendingClusterServeApplications | |||
|
|
|||
| var isPendingClusterServing bool | |||
There was a problem hiding this comment.
explicitly initialing it to false
rueian
force-pushed
the
rayservice-upgrade-safeguard
branch
2 times, most recently
from
5e23364 to
5b226cb
Compare
…r during a upgrade Signed-off-by: Rueian <[email protected]>
rueian
force-pushed
the
rayservice-upgrade-safeguard
branch
from
5b226cb to
1981f08
Compare
kevin85421
approved these changes
Feb 5, 2025
4 tasks
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?
Fixes #2877.
Currently, a pending cluster will only be overridden if it is unhealthy, which is safe, but this behavior implicitly relies on the current implementation. This PR introduces an explicit check to prevent the overriding of a pending cluster that is actively serving.
Related issue number
Checks