Use restore Keeper retries for restored parts#104610
Merged
pamarcos merged 3 commits intoMay 19, 2026
Merged
Conversation
RESTORE attaches replicated parts through the insert sink, which used the regular insert Keeper retry budget. Pass the restore retry settings into that path so transient Keeper failures do not fail RESTORE prematurely.
Contributor
|
Workflow [PR], commit [7d6b959] Summary: ✅ AI ReviewSummaryThis PR routes restored-part attachment in replicated Final Verdict
|
Forward declare ZooKeeperRetriesInfo instead of including the full Keeper retries header from the high fan-out MergeTreeData header.
Contributor
LLVM Coverage Report
Changed lines: 100.00% (61/61) | lost baseline coverage: 17 line(s) · Uncovered code |
CheSema
approved these changes
May 13, 2026
1 task
Merged
via the queue into
ClickHouse:master
with commit May 19, 2026
52750b3
325 of 326 checks passed
This was referenced May 19, 2026
robot-ch-test-poll1
added a commit
that referenced
this pull request
May 19, 2026
Cherry pick #104610 to 26.2: Use restore Keeper retries for restored parts
robot-clickhouse
added a commit
that referenced
this pull request
May 19, 2026
This was referenced May 19, 2026
robot-ch-test-poll1
added a commit
that referenced
this pull request
May 19, 2026
Cherry pick #104610 to 26.3: Use restore Keeper retries for restored parts
robot-clickhouse
added a commit
that referenced
this pull request
May 19, 2026
This was referenced May 19, 2026
robot-ch-test-poll1
added a commit
that referenced
this pull request
May 19, 2026
Cherry pick #104610 to 26.4: Use restore Keeper retries for restored parts
robot-clickhouse
added a commit
that referenced
this pull request
May 19, 2026
robot-ch-test-poll1
added a commit
that referenced
this pull request
May 20, 2026
Cherry pick #104610 to 25.8: Use restore Keeper retries for restored parts
robot-clickhouse
added a commit
that referenced
this pull request
May 20, 2026
pamarcos
added a commit
that referenced
this pull request
May 20, 2026
Backport #104610 to 26.4: Use restore Keeper retries for restored parts
pamarcos
added a commit
that referenced
this pull request
May 20, 2026
Backport #104610 to 26.3: Use restore Keeper retries for restored parts
pamarcos
added a commit
that referenced
this pull request
May 20, 2026
Backport #104610 to 26.2: Use restore Keeper retries for restored parts
pamarcos
added a commit
that referenced
this pull request
May 20, 2026
Backport #104610 to 25.8: Use restore Keeper retries for restored parts
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.
RESTOREof replicated tables restores data by attaching parts through the samesink path used by inserts. That path used
insert_keeper_max_retries, so atemporary Keeper outage or replica read-only period could fail a long-running
restore even when
backup_restore_keeper_max_retrieswas configured to tolerateit.
Pass the restore Keeper retry settings into restored part attachment, so the
data phase follows the same retry budget as the rest of
RESTORE.Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes into CHANGELOG.md):
Fixed
RESTOREof replicatedMergeTreetables so restored part attachment usesbackup_restore_keeper_max_retriesinstead of the regular insert Keeper retry budget.Documentation entry for user-facing changes