Skip to content

[data] Reset external queue metrics #56604

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
alexeykudinkin merged 8 commits into from
Sep 18, 2025
Merged

[data] Reset external queue metrics #56604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e082468
[data] Fix external queue metrics
iamjustinhsu Sep 17, 2025
e912345
fix
iamjustinhsu Sep 17, 2025
65f072d
update more frequently
iamjustinhsu Sep 17, 2025
ad73479
incremental delta
iamjustinhsu Sep 17, 2025
84e87c4
maybe
iamjustinhsu Sep 17, 2025
0fbb9ff
better
iamjustinhsu Sep 17, 2025
b076b65
fix tests
iamjustinhsu Sep 17, 2025
a5e3252
make z's
iamjustinhsu Sep 18, 2025
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
6 changes: 4 additions & 2 deletions python/ray/data/_internal/execution/streaming_executor_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,8 @@ def add_output(self, ref: RefBundle) -> None:
self.op.metrics.num_restarting_actors = actor_info.restarting
self.op.metrics.num_pending_actors = actor_info.pending
for next_op in self.op.output_dependencies:
next_op.metrics.num_external_inqueue_blocks = self.output_queue.num_blocks
next_op.metrics.num_external_inqueue_bytes = self.output_queue.memory_usage
next_op.metrics.num_external_inqueue_blocks += len(ref.blocks)
next_op.metrics.num_external_inqueue_bytes += ref.size_bytes()

def refresh_progress_bar(self, resource_manager: ResourceManager) -> None:
"""Update the console with the latest operator progress."""
Expand Down Expand Up @@ -353,6 +353,8 @@ def dispatch_next_task(self) -> None:
ref = inqueue.pop()
if ref is not None:
self.op.add_input(ref, input_index=i)
self.op.metrics.num_external_inqueue_bytes -= ref.size_bytes()
self.op.metrics.num_external_inqueue_blocks -= len(ref.blocks)
return

assert False, "Nothing to dispatch"
Expand Down
26 changes: 10 additions & 16 deletions python/ray/data/tests/test_stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def gen_expected_metrics(
"'num_outputs_of_finished_tasks': N",
"'bytes_outputs_of_finished_tasks': N",
"'rows_outputs_of_finished_tasks': N",
"'num_external_inqueue_blocks': N",
"'num_external_inqueue_bytes': N",
"'num_external_inqueue_blocks': Z",
"'num_external_inqueue_bytes': Z",
"'num_tasks_submitted': N",
"'num_tasks_running': Z",
"'num_tasks_have_outputs': N",
Expand Down Expand Up @@ -166,8 +166,8 @@ def gen_expected_metrics(
"'num_outputs_of_finished_tasks': Z",
"'bytes_outputs_of_finished_tasks': Z",
"'rows_outputs_of_finished_tasks': Z",
"'num_external_inqueue_blocks': N",
"'num_external_inqueue_bytes': N",
"'num_external_inqueue_blocks': Z",
"'num_external_inqueue_bytes': Z",
"'num_tasks_submitted': Z",
"'num_tasks_running': Z",
"'num_tasks_have_outputs': Z",
Expand Down Expand Up @@ -710,8 +710,8 @@ def test_dataset__repr__(ray_start_regular_shared, restore_data_context):
" num_outputs_of_finished_tasks: N,\n"
" bytes_outputs_of_finished_tasks: N,\n"
" rows_outputs_of_finished_tasks: N,\n"
" num_external_inqueue_blocks: N,\n"
" num_external_inqueue_bytes: N,\n"
" num_external_inqueue_blocks: Z,\n"
" num_external_inqueue_bytes: Z,\n"
" num_tasks_submitted: N,\n"
" num_tasks_running: Z,\n"
" num_tasks_have_outputs: N,\n"
Expand Down Expand Up @@ -842,8 +842,8 @@ def check_stats():
" num_outputs_of_finished_tasks: N,\n"
" bytes_outputs_of_finished_tasks: N,\n"
" rows_outputs_of_finished_tasks: N,\n"
" num_external_inqueue_blocks: N,\n"
" num_external_inqueue_bytes: N,\n"
" num_external_inqueue_blocks: Z,\n"
" num_external_inqueue_bytes: Z,\n"
" num_tasks_submitted: N,\n"
" num_tasks_running: Z,\n"
" num_tasks_have_outputs: N,\n"
Expand Down Expand Up @@ -929,8 +929,8 @@ def check_stats():
" num_outputs_of_finished_tasks: N,\n"
" bytes_outputs_of_finished_tasks: N,\n"
" rows_outputs_of_finished_tasks: N,\n"
" num_external_inqueue_blocks: N,\n"
" num_external_inqueue_bytes: N,\n"
" num_external_inqueue_blocks: Z,\n"
" num_external_inqueue_bytes: Z,\n"
" num_tasks_submitted: N,\n"
" num_tasks_running: Z,\n"
" num_tasks_have_outputs: N,\n"
Expand Down Expand Up @@ -1985,12 +1985,6 @@ def test_op_metrics_logging():
+ gen_expected_metrics(is_map=False)
) # .replace("'obj_store_mem_used': N", "'obj_store_mem_used': Z")
# InputDataBuffer has no inqueue, manually set to 0
input_str = input_str.replace(
"'num_external_inqueue_blocks': N", "'num_external_inqueue_blocks': Z"
)
input_str = input_str.replace(
"'num_external_inqueue_bytes': N", "'num_external_inqueue_bytes': Z"
)
map_str = (
"Operator TaskPoolMapOperator[ReadRange->MapBatches(<lambda>)] completed. "
"Operator Metrics:\n"
Expand Down