-
Notifications
You must be signed in to change notification settings - Fork 1.2k
v8.5.5: br: add compatibility between log backup and PITR (#20002) #21175
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
Open
ti-chi-bot
wants to merge
8
commits into
pingcap:release-8.5
Choose a base branch
from
ti-chi-bot:cherry-pick-20002-to-release-8.5
base: release-8.5
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+23
−1
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5d8a214
新增日志备份与恢复之兼容性
YuJuncen 1ed5d54
Update br/br-pitr-manual.md
YuJuncen 8dd0ed2
Apply suggestions from code review
YuJuncen a879f6a
Update format
lilin90 76b9f95
Apply suggestions from code review
lilin90 289f19c
Update wording
lilin90 d71d49a
Improve wording consistency
lilin90 4591436
Apply suggestions from code review
lilin90 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -497,4 +497,26 @@ tiup br restore point --pd="${PD_IP}:2379" | |||||
| --crypter.key 0123456789abcdef0123456789abcdef | ||||||
| --master-key-crypter-method aes128-ctr | ||||||
| --master-key "local:///path/to/master.key" | ||||||
| ``` | ||||||
| ``` | ||||||
|
|
||||||
| ### 进行中的日志备份与快照恢复的兼容性 | ||||||
|
|
||||||
| 从 v9.0.0 开始,当存在日志备份任务时,如果**同时满足**以下条件,则可以正常进行快照恢复 (`br restore [full|database|table]`),并且恢复的数据可以被进行中的日志备份(下称“日志备份”)正常记录: | ||||||
|
|
||||||
| - 执行备份恢复操作的节点需要同时具备以下权限: | ||||||
| - 对备份来源外部存储的读取权限,用于执行快照恢复 | ||||||
| - 对日志备份目标外部存储的写入权限 | ||||||
| - 日志备份的目标外部存储类型是 Amazon S3 (`s3://`)、Google Cloud Storage (`gcs://`) 或 Azure Blob Storage (`azblob://`)。 | ||||||
| - 待恢复的数据与日志备份的目标存储拥有相同的外部存储类型。 | ||||||
| - 待恢复的数据和日志备份均未开启本地加密,参考[日志备份加密](#加密日志备份数据)和[快照备份加密](/br/br-snapshot-manual.md#备份数据加密)。 | ||||||
|
|
||||||
| 如果不能同时满足上述条件或者要恢复到时间点,当存在日志备份任务时,BR 会拒绝恢复数据。此时,可以通过以下步骤完成数据恢复: | ||||||
|
|
||||||
| 1. [停止备份任务](#停止日志备份任务)。 | ||||||
| 2. 进行数据恢复。 | ||||||
| 3. 恢复完成后,重新进行快照备份。 | ||||||
| 4. [重新启动备份任务](#重新启动备份任务)。 | ||||||
|
|
||||||
| > **注意:** | ||||||
| > | ||||||
| > 当恢复记录了快照(全量)恢复数据的日志备份时,需要使用 v9.0.0 及之后版本的 BR,否则可能导致记录下来的全量恢复数据无法被恢复。 | ||||||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.