Skip to content
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

[Core] Cherry pick #47714, #47701 #47719

Merged
merged 2 commits into from
Sep 17, 2024
Merged

[Core] Cherry pick #47714, #47701 #47719

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2f5508
[Core] Fix broken dashboard cluster page when there are dead nodes (#…
jjyao Sep 17, 2024
2d5c37f
[Core] Fix broken dashboard worker page (#47714)
jjyao Sep 17, 2024
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
9 changes: 4 additions & 5 deletions python/ray/dashboard/datacenter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ async def organize(cls, thread_pool_executor):
node_stats,
)
for worker in workers:
stats = worker.get("coreWorkerStats", {})
if stats:
for stats in worker.get("coreWorkerStats", []):
worker_id = stats["workerId"]
core_worker_stats[worker_id] = stats
node_workers[node_id] = workers
Expand All @@ -113,7 +112,9 @@ def merge_workers_for_node(cls, node_physical_stats, node_stats):
for worker in node_physical_stats.get("workers", []):
worker = dict(worker)
pid = worker["pid"]
worker["coreWorkerStats"] = pid_to_worker_stats.get(pid, {})
core_worker_stats = pid_to_worker_stats.get(pid)
# Empty list means core worker stats is not available.
worker["coreWorkerStats"] = [core_worker_stats] if core_worker_stats else []
worker["language"] = pid_to_language.get(
pid, dashboard_consts.DEFAULT_LANGUAGE
)
Expand Down Expand Up @@ -147,8 +148,6 @@ async def get_node_info(cls, node_id, get_summary=False):
node_info["raylet"] = node_stats
node_info["raylet"].update(ray_stats)

node_info["status"] = node["stateSnapshot"]["state"]

# Merge GcsNodeInfo to node physical stats
node_info["raylet"].update(node)
death_info = node.get("deathInfo", {})
Expand Down
Loading