Fix serve status ordering by READY and versionfix replica ordering #5188
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
cblmemo
reviewed
Apr 27, 2025
There was a problem hiding this comment.
Thanks for adding this @mert-cemri ! It mostly looks good to me. However, there seems to contain some unnecessary refactoring. Could we keep as much original code as possible to keep the chance of breaking anything as low as possible?
Comment on lines
+4722
to
+4723
| service_names_to_query: Optional[List[str]] = list( | ||
| service_names) if service_names else None |
There was a problem hiding this comment.
Why do we need to convert it to list here?
| service_names_to_query: Optional[List[str]] = list( | ||
| service_names) if service_names else None | ||
|
|
||
| # Show a status message while fetching data |
There was a problem hiding this comment.
Those comments looks a little bit tedious. Could we remove them?
Comment on lines
+767
to
+788
| def _sort_replica_records( | ||
| replica_records: List[Dict[str, Any]]) -> List[Dict[str, Any]]: | ||
| """Sort replica records based on version, status and replica_id.""" | ||
|
|
||
| # Define the sorting key function internally | ||
| def _sort_key(replica_record: Dict[str, Any]) -> Tuple[int, int, int]: | ||
| # Sort by version descending (latest first) | ||
| version = int(replica_record.get('version', 0)) | ||
| # Sort by status, prioritizing READY | ||
| if replica_record['status'] == serve_state.ReplicaStatus.READY: | ||
| status_priority = 0 | ||
| elif replica_record['status'] == serve_state.ReplicaStatus.PROVISIONING: | ||
| status_priority = 1 | ||
| else: | ||
| status_priority = 2 | ||
| # Sort by replica_id ascending as a tie-breaker | ||
| replica_id = int(replica_record.get('id', 0)) | ||
| return -version, status_priority, replica_id | ||
|
|
||
| # Sort the records using the defined key | ||
| sorted_records = sorted(replica_records, key=_sort_key) | ||
| return sorted_records |
There was a problem hiding this comment.
This seems will mix replica records for different service together. Should we sort first based on its service name?
| if not service_records: | ||
| return 'No existing services.' | ||
| return 'No services found.' |
| # Add service name and replica id to replica info dict. | ||
| for info in record['replica_info']: | ||
| info['service_name'] = record['name'] | ||
| info['replica_id'] = info['id'] |
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.
Fixes #3052
Tested (run the relevant ones):
bash format.sh/smoke-test(CI) orpytest tests/test_smoke.py(local)/smoke-test -k test_name(CI) orpytest tests/test_smoke.py::test_name(local)/quicktest-core(CI) orpytest tests/smoke_tests/test_backward_compat.py(local)