Skip to content

Conversation

@loomts
Copy link
Contributor

@loomts loomts commented Dec 18, 2025

resolved https://github.com/apecloud/apecloud/issues/15368
fix sharding restore and inc backup issues

  • restore: if current shards>backup target, can do restore, and skip the extra shards.
  • incremental backup: if latest backup shards(get from cluster snapshot) != current shards, cannot do incremental backup

@github-actions github-actions bot added the size/M Denotes a PR that changes 30-99 lines. label Dec 18, 2025
@apecloud-bot
Copy link
Collaborator

Auto Cherry-pick Instructions

Usage:
  - /nopick: Not auto cherry-pick when PR merged.
  - /pick: release-x.x [release-x.x]: Auto cherry-pick to the specified branch when PR merged.

Example:
  - /nopick
  - /pick release-1.0

@apecloud-bot
Copy link
Collaborator

This branch name is not following the standards: feature/|bugfix/|release/|hotfix/|support/|releasing/|dependabot/

1 similar comment
@apecloud-bot
Copy link
Collaborator

This branch name is not following the standards: feature/|bugfix/|release/|hotfix/|support/|releasing/|dependabot/

@github-actions github-actions bot added size/L Denotes a PR that changes 100-499 lines. and removed size/M Denotes a PR that changes 30-99 lines. labels Dec 22, 2025
@loomts loomts added the nopick Not auto cherry-pick when PR merged label Dec 22, 2025
@codecov
Copy link

codecov bot commented Dec 22, 2025

Codecov Report

❌ Patch coverage is 35.71429% with 54 lines in your changes missing coverage. Please review.
✅ Project coverage is 51.72%. Comparing base (a24a1e6) to head (9639725).
⚠️ Report is 8 commits behind head on main.

Files with missing lines Patch % Lines
...ollers/apps/cluster/transformer_cluster_restore.go 0.00% 23 Missing ⚠️
...rs/dataprotection/backuppolicydriver_controller.go 28.12% 17 Missing and 6 partials ⚠️
controllers/dataprotection/utils.go 80.00% 4 Missing and 1 partial ⚠️
pkg/controller/plan/restore.go 0.00% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9944      +/-   ##
==========================================
+ Coverage   50.97%   51.72%   +0.75%     
==========================================
  Files         541      541              
  Lines       58289    59006     +717     
==========================================
+ Hits        29712    30522     +810     
+ Misses      25656    25529     -127     
- Partials     2921     2955      +34     
Flag Coverage Δ
unittests 51.72% <35.71%> (+0.75%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@loomts loomts marked this pull request as ready for review December 26, 2025 02:40
@loomts loomts requested review from a team, ldming and wangyelei as code owners December 26, 2025 02:40
if err = c.cleanupRestoreAnnotationForSharding(dag, spec.Name, restoreDoneForShardComponents); err != nil {
return err
}
continue
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cause restore shards count may be larger than backup.targets, when allocateTargetMap == targets, need to add skip annotations for the remaining shards to ensure deterministic status and tell the restore reconciler to skip them

@apecloud-bot apecloud-bot added the approved PR Approved Test label Dec 26, 2025
@loomts loomts merged commit fe150cd into main Dec 26, 2025
57 of 59 checks passed
@loomts loomts deleted the feat/improve-sharding-restore branch December 26, 2025 09:56
@github-actions github-actions bot added this to the Release 1.1.0 milestone Dec 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved PR Approved Test nopick Not auto cherry-pick when PR merged size/L Denotes a PR that changes 100-499 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants