Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for restoring from backup root #6486

Merged
merged 2 commits into from
Aug 21, 2024

Conversation

JohnNiang
Copy link
Member

What type of PR is this?

/kind feature
/area core
/area console

What this PR does / why we need it:

This PR adds support of restoring from backup root.

Which issue(s) this PR fixes:

Fixes #6370

Special notes for your reviewer:

Does this PR introduce a user-facing change?

支持从备份目录选择文件进行恢复

@f2c-ci-robot f2c-ci-robot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Aug 20, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and LIlGG August 20, 2024 10:19
@f2c-ci-robot f2c-ci-robot bot added area/core Issues or PRs related to the Halo Core area/console Issues or PRs related to the Halo Console labels Aug 20, 2024
@JohnNiang
Copy link
Member Author

Hi @halo-dev/sig-halo-console , please help me adapt the console to support restoring Halo from backup root.

@ruibaby
Copy link
Member

ruibaby commented Aug 20, 2024

Hi @halo-dev/sig-halo-console , please help me adapt the console to support restoring Halo from backup root.

vme50,and then live-stream teaching you console adaptation

@JohnNiang
Copy link
Member Author

Hi @ruibaby , 选择备份文件进行恢复时,没有提示选择的具体备份文件

image

@ruibaby
Copy link
Member

ruibaby commented Aug 21, 2024

/retitle Add support of restoring from backup root

@f2c-ci-robot f2c-ci-robot bot changed the title WIP: Add support of restoring from backup root Add support of restoring from backup root Aug 21, 2024
@f2c-ci-robot f2c-ci-robot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 21, 2024
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Aug 21, 2024
@JohnNiang JohnNiang changed the title Add support of restoring from backup root Add support for restoring from backup root Aug 21, 2024
@JohnNiang JohnNiang force-pushed the feat/restore-from-folder branch from bae6cac to 6cd8dc8 Compare August 21, 2024 03:46
Copy link

f2c-ci-robot bot commented Aug 21, 2024

New changes are detected. LGTM label has been removed.

@f2c-ci-robot f2c-ci-robot bot removed the lgtm Indicates that a PR is ready to be merged. label Aug 21, 2024
Copy link

@JohnNiang JohnNiang added the tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges. label Aug 21, 2024
@JohnNiang JohnNiang added this to the 2.19.0 milestone Aug 21, 2024
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

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

/approve

Copy link

f2c-ci-robot bot commented Aug 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guqing

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 21, 2024
Copy link

codecov bot commented Aug 21, 2024

Codecov Report

Attention: Patch coverage is 56.66667% with 26 lines in your changes missing coverage. Please review.

Project coverage is 58.18%. Comparing base (d19c27b) to head (6cd8dc8).
Report is 9 commits behind head on main.

Files Patch % Lines
...java/run/halo/app/migration/MigrationEndpoint.java 21.42% 22 Missing ⚠️
...c/main/java/run/halo/app/migration/BackupFile.java 60.00% 2 Missing ⚠️
.../halo/app/migration/impl/MigrationServiceImpl.java 92.59% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6486      +/-   ##
============================================
- Coverage     58.27%   58.18%   -0.10%     
+ Complexity     3783     3774       -9     
============================================
  Files           651      651              
  Lines         22139    22125      -14     
  Branches       1555     1538      -17     
============================================
- Hits          12902    12873      -29     
- Misses         8613     8641      +28     
+ Partials        624      611      -13     

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

@ruibaby ruibaby merged commit ad81f6d into halo-dev:main Aug 21, 2024
7 of 8 checks passed
@JohnNiang JohnNiang deleted the feat/restore-from-folder branch August 21, 2024 04:09
f2c-ci-robot bot pushed a commit that referenced this pull request Aug 23, 2024
#### What type of PR is this?

/area ui
/kind bug
/milestone 2.19.x

#### What this PR does / why we need it:

修复备份相关的 API 接口地址错误的问题,此问题由 #6486 引入,后端修改地址之后,前端没有对应修改。

#### Does this PR introduce a user-facing change?

```release-note
None
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/console Issues or PRs related to the Halo Console area/core Issues or PRs related to the Halo Core kind/feature Categorizes issue or PR as related to a new feature. release-note Denotes a PR that will be considered when it comes time to generate release notes. tide/merge-method-merge Denotes a PR that should use a standard merge by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

恢复备份时,从已有备份恢复建议改为选择 backups 目录的文件进行恢复。
3 participants