Skip to content

fix(cluster): map all CodeFlareClusterStatus values to RayClusterStatus in _copy_to_ray() #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 22, 2026
Merged

fix(cluster): map all CodeFlareClusterStatus values to RayClusterStatus in _copy_to_ray() #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/codeflare_sdk/ray/cluster/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1199,10 +1199,22 @@ def _map_to_ray_cluster(rc) -> Optional[RayCluster]:
)


_CODEFLARE_TO_RAY_STATUS = {
CodeFlareClusterStatus.READY: RayClusterStatus.READY,
CodeFlareClusterStatus.FAILED: RayClusterStatus.FAILED,
CodeFlareClusterStatus.SUSPENDED: RayClusterStatus.SUSPENDED,
CodeFlareClusterStatus.UNKNOWN: RayClusterStatus.UNKNOWN,
CodeFlareClusterStatus.STARTING: RayClusterStatus.UNKNOWN,
CodeFlareClusterStatus.QUEUED: RayClusterStatus.UNKNOWN,
CodeFlareClusterStatus.QUEUEING: RayClusterStatus.UNKNOWN,
}


def _copy_to_ray(cluster: Cluster) -> RayCluster:
ray = RayCluster(
cf_status = cluster.status(print_to_console=False)[0]
return RayCluster(
name=cluster.config.name,
status=cluster.status(print_to_console=False)[0],
status=_CODEFLARE_TO_RAY_STATUS.get(cf_status, RayClusterStatus.UNKNOWN),
num_workers=cluster.config.num_workers,
worker_mem_requests=cluster.config.worker_memory_requests,
worker_mem_limits=cluster.config.worker_memory_limits,
Expand All @@ -1217,9 +1229,6 @@ def _copy_to_ray(cluster: Cluster) -> RayCluster:
head_cpu_limits=cluster.config.head_cpu_limits,
head_extended_resources=cluster.config.head_extended_resource_requests,
)
if ray.status == CodeFlareClusterStatus.READY:
ray.status = RayClusterStatus.READY
return ray


# Check if the routes api exists
Expand Down
26 changes: 26 additions & 0 deletions src/codeflare_sdk/ray/cluster/test_cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
route_list_retrieval,
)
from codeflare_sdk.ray.cluster.cluster import _is_openshift_cluster
from codeflare_sdk.ray.cluster.status import CodeFlareClusterStatus, RayClusterStatus
from pathlib import Path
from unittest.mock import MagicMock
from kubernetes import client
Expand All @@ -47,6 +48,31 @@
cluster_dir = os.path.expanduser("~/.codeflare/resources/")


@pytest.mark.parametrize(
"cf_status,expected_ray_status",
[
(CodeFlareClusterStatus.READY, RayClusterStatus.READY),
(CodeFlareClusterStatus.FAILED, RayClusterStatus.FAILED),
(CodeFlareClusterStatus.SUSPENDED, RayClusterStatus.SUSPENDED),
(CodeFlareClusterStatus.UNKNOWN, RayClusterStatus.UNKNOWN),
(CodeFlareClusterStatus.STARTING, RayClusterStatus.UNKNOWN),
(CodeFlareClusterStatus.QUEUED, RayClusterStatus.UNKNOWN),
(CodeFlareClusterStatus.QUEUEING, RayClusterStatus.UNKNOWN),
],
)
def test_details_maps_codeflare_status_to_ray_status(
mocker, cf_status, expected_ray_status
):
cluster = create_cluster(mocker)
mocker.patch.object(cluster, "status", return_value=(cf_status, ""))
mocker.patch.object(cluster, "cluster_dashboard_uri", return_value="http://fake")

ray_cluster = cluster.details(print_to_console=False)

assert ray_cluster.status == expected_ray_status
assert isinstance(ray_cluster.status, RayClusterStatus)


def test_cluster_apply_down(mocker):
mocker.patch("kubernetes.client.ApisApi.get_api_versions")
mocker.patch("kubernetes.config.load_kube_config", return_value="ignore")
Expand Down
Loading