Skip to content

Cherry pick #63513 to 24.3: Make MergeTreePrefetchedReadPool safer#63590

Merged
robot-ch-test-poll3 merged 4 commits intobackport/24.3/63513from
cherrypick/24.3/78af18ac87e58dd7e81b6161f5e114d8fa34ef67
May 10, 2024
Merged

Cherry pick #63513 to 24.3: Make MergeTreePrefetchedReadPool safer#63590
robot-ch-test-poll3 merged 4 commits intobackport/24.3/63513from
cherrypick/24.3/78af18ac87e58dd7e81b6161f5e114d8fa34ef67

Conversation

@robot-ch-test-poll
Copy link
Copy Markdown
Contributor

Original pull-request #63513

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
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.

Note

This pull-request will be merged automatically. Please, do not merge it manually (but if you accidentally did, nothing bad will happen).

Troubleshooting

If the PR was manually reopened after being closed

If this PR is stuck (i.e. not automatically merged after one day), check #63513 for pr-backports-created label and delete it.

Manually merging will do nothing. The pr-backports-created label prevents the original PR #63513 from being processed.

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:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the original PR #63513 for pr-backports-created, and delete if it's presented there

@robot-ch-test-poll robot-ch-test-poll added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request labels May 10, 2024
@robot-ch-test-poll3 robot-ch-test-poll3 merged this pull request into backport/24.3/63513 May 10, 2024
@robot-ch-test-poll3 robot-ch-test-poll3 deleted the cherrypick/24.3/78af18ac87e58dd7e81b6161f5e114d8fa34ef67 branch May 10, 2024 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants