branch-4.1: [fix](fe) cache version and get tablet stats actively for RestoreJob (#62704)#64045
Merged
Merged
Conversation
Contributor
Author
|
run buildall |
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
There was a problem hiding this comment.
Pull request overview
Backports a FE fix to improve cloud restore correctness by propagating restored table/partition version cache updates and proactively marking restored tablets as active so stats can be fetched after RestoreJob completes.
Changes:
- Change
RestoreJob.updateOlapTablesVersionto beprotectedand acceptisReplay, enabling cloud-specific overrides. - Add a
CloudRestoreJoboverride that pushes table/partition version caches to other FEs and registers restored tablets withCloudTabletStatMgr. - Cache the returned table version on partition commit, and refresh cloud partition cached visible versions during restore meta prepare.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
fe/fe-core/src/main/java/org/apache/doris/cloud/backup/CloudRestoreJob.java |
Adds cloud-specific version sync + active-tablet registration and updates cached version handling during restore. |
fe/fe-core/src/main/java/org/apache/doris/backup/RestoreJob.java |
Refactors version-update hook to be overridable and replay-aware. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+175
to
+183
| // sync version | ||
| List<Pair<OlapTable, Long>> tableVersionMap = Lists.newArrayList( | ||
| Pair.of(olapTable, olapTable.getCachedTableVersion())); | ||
| Map<CloudPartition, Pair<Long, Long>> partitionVersionMap = new HashMap<>(olapTable.getPartitions().size()); | ||
| for (Partition partition : olapTable.getPartitions()) { | ||
| CloudPartition cloudPartition = (CloudPartition) partition; | ||
| long version = cloudPartition.getCachedVisibleVersion(); | ||
| partitionVersionMap.put(cloudPartition, Pair.of(version, partition.getVisibleVersionTime())); | ||
| } |
Comment on lines
+498
to
+503
| ((CloudPartition) partition).setCachedVisibleVersion(partition.getVisibleVersion(), | ||
| System.currentTimeMillis()); | ||
| LOG.info("set cloud partition: {}, version: {}, versionTime: {}", | ||
| partition.getId(), partition.getCachedVisibleVersion(), | ||
| partition.getVisibleVersionTime()); | ||
| } |
Contributor
FE UT Coverage ReportIncrement line coverage |
Contributor
FE Regression Coverage ReportIncrement line coverage |
yiguolei
approved these changes
Jun 3, 2026
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.
pick #62704