Cherry pick #86422 to 25.7: Fix leaking of MergesMutationsMemoryTracking and fix query_views_log for streaming#86465
Merged
robot-clickhouse merged 3 commits intobackport/25.7/86422from Sep 1, 2025
Conversation
This place forgot to call background_memory_tracker.adjustOnBackgroundTaskEnd(), like we do for merges/mutations and this may lead to significant drift in MergesMutationsMemoryTracking, which later will lead to TOO_MANY_PARTS, because merges will stop. At first I actually added it (adjustOnBackgroundTaskEnd()) but later decided that it is wrong, merges/mutations should not take care about Buffer flushes. Note, maybe it will be a good idea to have a RAII for return value of createForBackgroundProcess() that will take care of adjustOnBackgroundTaskEnd(), but but this is not can be tricky since you need to make sure that there are no users of it (i.e. ThreadGroupSwitcher already finished).
It has been removed in the previous patch from StorageBuffer::backgroundFlush(), but, it is required for query_views_log. So let's get it back, but in a more generic fashion.
Fix leaking of MergesMutationsMemoryTracking and fix query_views_log for streaming
63a105a
into
backport/25.7/86422
121 of 146 checks passed
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
3 participants
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 #86422
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