Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
RidRisR committed Jan 17, 2025
1 parent 99ca3d6 commit 6a62af6
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 45 deletions.
4 changes: 1 addition & 3 deletions en/backup-restore-cr.md
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ This section introduces the fields in the `Backup` CR.
* `.spec.local.volume`: the persistent volume configuration.
* `.spec.local.volumeMount`: the persistent volume mount configuration.
## Backup CR fields
## CompactBackup CR fields
To compress log backup data into structured SST files, users can create a custom CompactBackup CR object to describe a backup task. Below is a detailed explanation of the fields in the CompactBackup CR:
Expand All @@ -277,8 +277,6 @@ To compress log backup data into structured SST files, users can create a custom
* `.spec.gcs`: GCS-related configuration. Refer to [GCS fields](#gcs-fields).
* `.spec.azblob`:Azure Blob Storage-related configuration. Refer to [Azure Blob Storage fields](#azure-blob-storage-fields).
## Restore CR fields
To restore data to a TiDB cluster on Kubernetes, you can create a `Restore` CR object. For detailed restore process, refer to documents listed in [Restore data](backup-restore-overview.md#restore-data).
Expand Down
2 changes: 1 addition & 1 deletion en/renew-tls-certificate.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ If the original TLS certificates are issued by [the `cfssl` system](enable-tls-b

> **Note:**
>
> The above command only renews the server-side and the client-side certificate between PD, TiKV, and TiDB components. If you need to renew the server-side certificates for other components, such as TiCDC, TiFlash and TiProxy, you can execute the similar command.
> The above command only renews the server-side and the client-side certificate between PD, TiKV, and TiDB components. If you need to renew the server-side certificates for other components, such as TiCDC, TiFlash and TiProxy, you can execute the similar command.

3. [Perform the rolling restart](restart-a-tidb-cluster.md) to components that need to load the new certificates.

Expand Down
1 change: 0 additions & 1 deletion zh/backup-restore-cr.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ summary: 介绍用于备份与恢复的 Custom Resource (CR) 资源的各字段

为了将日志备份数据压缩成结构化SST,用户可以通过创建一个自定义的 `CompactBackup` CR 对象来描述一次备份,以下介绍 `CompactBackup` CR 各个字段的具体含义。


* `.spec.startTs`: 用于指定日志压缩备份的的范围起始时间戳。
* `.spec.endTs`: 用于指定日志压缩备份的范围结束时间戳。
* `.spec.concurrency`: 最大同时进行的压缩日志任务的数量。默认为4
Expand Down
40 changes: 0 additions & 40 deletions zh/backup-to-azblob-using-br.md
Original file line number Diff line number Diff line change
Expand Up @@ -369,46 +369,6 @@ demo1-log-backup-azblob log Stopped ....

其中, `startTs``endTs` 所选定的区间即为 `demo1-compact-backup` 即将压缩的日志备份区间。任何包含了至少一个在该时间区间内的写入的 Log 将会被整个送去压缩。 因此最终 Compact 的结果中可能包含该时间范围以外的写入。

### 压缩日志备份

`Compact Backup` CR 可以将日志备份数据压缩成SST格式来加速下游的时间点恢复(Point in Time Restore, PiTR)。

本节接续上文的日志备份的案例,介绍压缩日志备份的使用。

1. 在 backup-test 这个 namespace 中创建一个名为 demo1-compact-backup 的 CompactBackup CR。

```shell
kubectl apply -f compact-backup-demo1.yaml
```

`compact-backup-demo1.yaml` 的内容如下:

```yaml
---
apiVersion: pingcap.com/v1alpha1
kind: CompactBackup
metadata:
name: demo1-compact-backup
namespace: backup-test
spec:
startTs: "***"
endTs: "***"
concurrency: 8
maxRetryTimes: 2
br:
cluster: demo1
clusterNamespace: test1
sendCredToTikv: true
s3:
provider: aws
secretName: s3-secret
region: us-west-1
bucket: my-bucket
prefix: my-log-backup-folder
```

其中, `startTs``endTs` 所选定的区间即为 `demo1-compact-backup` 即将压缩的日志备份区间。任何包含了至少一个在该时间区间内的写入的 Log 将会被整个送去压缩。 因此最终 Compact 的结果中可能包含该时间范围以外的写入。

#### 查看压缩日志备份状态

创建好 `CompactBackup` CR之后,TiDB operator将会自动开始压缩日志备份。你可以通过如下命令查看备份状态:
Expand Down

0 comments on commit 6a62af6

Please sign in to comment.