Cherry pick #93612 to 25.11: Fix flaky test_disallow_concurrency#93931
Merged
pamarcos merged 17 commits intobackport/25.11/93612from Jan 12, 2026
Merged
Cherry pick #93612 to 25.11: Fix flaky test_disallow_concurrency#93931pamarcos merged 17 commits intobackport/25.11/93612from
pamarcos merged 17 commits intobackport/25.11/93612from
Conversation
…on race When restoring a ReplicatedMergeTree table ON CLUSTER, multiple replicas restore the same parts concurrently. If one replica commits a part to ZooKeeper first, the other replica's part gets deduplicated. The code assumed deduplicated parts always came from ATTACH PART (located in detached/attaching_*) and threw LOGICAL_ERROR for other paths, causing the server to abort. During restore, parts are in tmp_restore_* directories instead. Now deduplicated parts from restore are simply removed since the data already exists on another replica and will be fetched via normal replication.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This reverts commit 45fd898.
Fix flaky test_disallow_concurrency
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
6 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 #93612
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