Repository navigation
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
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.
Motivation
A worker response-stream error returns early from
worker_to_coordinator_taskthrough?, skipping the empty final reports normally inserted at end-of-stream. The query fails, but callers waiting for task metrics or completed dynamic filters can then wait indefinitely.This extracts the pre-existing bug fix identified in the review of #852.
Solution
Move ownership of the two optional report stores into a private
TaskReportsdrop guard in the existing worker response reader. Dropping the guard supplies defaults for missing reports, including on an early error. Receiving a real report takes its store out of the guard, so cleanup preserves that report.The change is confined to report cleanup and adds no public API or scheduling changes.
Result
A regression test uses the existing localhost fixture and routing hook to fail worker response channels after query execution starts. It verifies that the error still reaches the caller and that both metrics and dynamic-filter collection complete. On upstream
main(6347d36), the test timed out waiting for metrics; with this fix, it passes.Local validation on Rust 1.95 with incremental compilation disabled:
integration,system-metrics: 500 passed, 3 ignored, including unit tests, integration tests and doctests.-D warnings.git diff --check.The optional chaos, TPC-H, TPC-DS and ClickBench suites were not run.