{{ message }}
Cherry pick #108391 to 26.6: Fix data race on MemoryReservation release at query finish#108562
Open
robot-ch-test-poll3 wants to merge 5 commits into
Open
Cherry pick #108391 to 26.6: Fix data race on MemoryReservation release at query finish#108562robot-ch-test-poll3 wants to merge 5 commits into
robot-ch-test-poll3 wants to merge 5 commits into
Conversation
`BlockIO::onFinish` released the memory reservation before finalizing the pipeline, racing with executor threads that hold raw pointers to it. Release the query slot early (as before, for slot reuse) but the memory reservation only after the pipeline is finalized, matching `onException`. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
The previous commit released the `MemoryReservation` only at the very end of `BlockIO::onFinish`, after `finalize_query_pipeline` (and therefore after `CurrentThread::finalizePerformanceCounters`) had already run. The `MemoryReservationDecreases` profile event emitted by the reservation's destructor on the query thread then landed after the `query_log` snapshot and was lost, so `test_scheduler_memory/test.py::test_reserve_memory` failed with `MemoryReservationDecreases ... got 0`. Release the memory reservation inside `finalizeQueryPipelineBeforeLogging`, between `query_pipeline.reset()` and `finalizePerformanceCounters`. This is the only point that satisfies every constraint at once: the pipeline (and its threads) have already been torn down so there is no data race and the query's real memory is already freed (no under-reporting to the memory scheduler), while the event is still emitted before the `query_log` snapshot so it stays attributed to the query. The reservation also stays alive through `query_finish_callback`, which runs before `streams.onFinish`. `BlockIO::onFinish` keeps releasing the memory reservation only on the non-logging path; the logging path releases it inside the finalize step. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
…ery_log" This reverts commit 2db56a1.
…memory The reservation is released at query teardown (BlockIO::onFinish), after the query's ProfileEvents are snapshotted into query_log, so the decrease is not reliably attributed to the query. Asserting it per-query is race-prone; the test now checks only MemoryReservationIncreases/Killed/Failed. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…ease-race Fix data race on MemoryReservation release at query finish
Member
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.

Original pull-request #108391
Do not merge this PR manually
This pull-request is a first step of an automated backporting.
It contains changes similar to calling
git cherry-picklocally.If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.
The check results does not matter at this step - you can safely ignore them.
Troubleshooting
If the conflicts were resolved in a wrong way
If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:
pr-cherrypicklabel from the PRYou also need to check the Original pull-request for
pr-backports-createdlabel, and delete if it's presented thereThe PR source
The PR is created in the CI job