zh: update backup & restore table filter usage and bump tidb cluster version to v4.0.6 #699

lichunzhu · 2020-09-14T06:56:25Z

What is changed, added or deleted? (Required)

#671
TiDB-operator has updated backup and restore table filters in pingcap/tidb-operator#3134. This PR will also update the usage of table filter and bump tidb version to v4.0.6.

Which TiDB Operator version(s) do your changes apply to? (Required)

master (the latest development version)
v1.1 (TiDB Operator 1.1 versions)
v1.0 (TiDB Operator 1.0 versions)

What is the related PR or file link(s)?

This PR is translated from:
Other reference link(s):

Do your changes match any of the following descriptions?

Delete files
Change aliases
Have version specific changes
Might cause conflicts

lichunzhu · 2020-09-14T06:56:48Z

This PR should be merged after version v4.0.6 is released.

lichunzhu · 2020-09-14T06:57:52Z

/cc ran-huang,DanielZhangQD

lichunzhu · 2020-09-14T06:58:00Z

/label needs-cherry-pick-1.1

DanielZhangQD · 2020-09-14T07:15:19Z

zh/backup-to-gcs.md


    ```
    options:
    - --threads=16
    - --rows=10000
+    ```
+
+* `.spec.storageClassName`：备份时指定所需的 persistent volume (PV) 类型。如果不指定该项，则默认使用 TiDB Operator 启动参数中 `default-backup-storage-class-name` 指定的值，该值默认为 `standard`。


default-backup-storage-class-name 这个没有了

DanielZhangQD

LGTM

ran-huang · 2020-09-16T02:43:17Z

zh/backup-to-gcs.md

@@ -168,12 +168,19 @@ GCS 支持以下几种 bucket ACL 策略：
 * `.spec.from.tidbSecretName`：待备份 TiDB 集群所需凭证的 secret。
 * `.spec.gcs.bucket`：存储数据的 bucket 名字。
 * `.spec.gcs.prefix`：这个字段可以省略，如果设置了这个字段，则会使用这个字段来拼接在远端存储的存储路径 `s3://${.spec.gcs.bucket}/${.spec.gcs.prefix}/backupName`。
-* `.spec.dumpling`：Dumpling 相关的配置，主要有两个字段：一个是 `options` 字段，里面可以指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；一个是 `tableFilter` 字段，可以指定让 Dumpling 备份符合 [table-filter 规则](https://docs.pingcap.com/zh/tidb/stable/table-filter/) 的表。默认情况下 dumpling 这个字段可以不用配置。当不指定 dumpling 的配置时，`options` 和 `tableFilter` 字段的默认值如下：
+* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 dumpling 的配置时，`options` 字段的默认值如下：


Suggested change

* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 dumpling 的配置时，`options` 字段的默认值如下：

* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 Dumpling 的配置时，`options` 字段的默认值如下：

ran-huang · 2020-09-16T02:45:43Z

zh/backup-to-s3.md

@@ -280,12 +280,19 @@ kubectl get bk -n test1 -owide
 * `.spec.s3.region`：使用 Amazon S3 存储备份，需要配置 Amazon S3 所在的 region。
 * `.spec.s3.bucket`：兼容 S3 存储的 bucket 名字。
 * `.spec.s3.prefix`：这个字段可以省略，如果设置了这个字段，则会使用这个字段来拼接在远端存储的存储路径 `s3://${.spec.s3.bucket}/${.spec.s3.prefix}/backupName`。
-* `.spec.dumpling`：Dumpling 相关的配置，主要有两个字段：一个是 `options` 字段，里面可以指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；一个是 `tableFilter` 字段，可以指定让 Dumpling 备份符合 [table-filter 规则](https://docs.pingcap.com/zh/tidb/stable/table-filter/) 的表。默认情况下 dumpling 这个字段可以不用配置。当不指定 dumpling 的配置时，`options` 和 `tableFilter` 字段的默认值如下：
+* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 dumpling 的配置时，`options` 字段的默认值如下：


Suggested change

* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 dumpling 的配置时，`options` 字段的默认值如下：

* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 Dumpling 的配置时，`options` 字段的默认值如下：

ran-huang · 2020-09-16T02:48:17Z

zh/restore-from-aws-s3-using-br.md

+
+    > **注意：**
+    >
+    > tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `*.*` 规则来导出所有表，如下面例子所示：


Suggested change

> tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `*.*` 规则来导出所有表，如下面例子所示：

> `tableFilter` 如果要写排除规则导出除 `db.table` 的所有表，`"!db.table"` 前必须先添加 `*.*` 规则来导出所有表，如下面例子所示：

ran-huang · 2020-09-16T02:49:32Z

zh/backup-to-aws-s3-using-br.md

+
+    > **注意：**
+    >
+    > tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `*.*` 规则来导出所有表，如下面例子所示：


Suggested change

> tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `*.*` 规则来导出所有表，如下面例子所示：

> `tableFilter` 如果要写排除规则导出除 `db.table` 的所有表，`"!db.table"` 前必须先添加 `*.*` 规则来导出所有表，如下面例子所示：

ran-huang · 2020-09-16T02:50:23Z

zh/restore-from-gcs-using-br.md

+
+    > **注意：**
+    >
+    > tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `*.*` 规则来导出所有表，如下面例子所示：


Suggested change

> tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `*.*` 规则来导出所有表，如下面例子所示：

> `tableFilter` 如果要写排除规则导出除 `db.table` 的所有表，`"!db.table"` 前必须先添加 `*.*` 规则来导出所有表，如下面例子所示：

ran-huang · 2020-09-16T10:23:40Z

/merge

ti-srebot · 2020-09-16T10:24:06Z

/run-all-tests

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2020-09-17T06:14:55Z

cherry pick to release-1.1 in PR #705

Signed-off-by: ti-srebot <ti-srebot@pingcap.com> Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>

lichunzhu added 2 commits September 14, 2020 14:15

update tableFilter usage for backup and restore spec

c7071f8

bump tidb cluster version to v4.0.6

e4c871f

ti-srebot requested review from DanielZhangQD and ran-huang September 14, 2020 06:57

ti-srebot added the needs-cherry-pick-release-1.1 Should cherry pick this PR to release-1.1 branch. label Sep 14, 2020

lichunzhu mentioned this pull request Sep 14, 2020

Release v1.1.5 pingcap/tidb-operator#3263

Closed

6 tasks

DanielZhangQD reviewed Sep 14, 2020

View reviewed changes

address comments

5a89b5d

DanielZhangQD approved these changes Sep 14, 2020

View reviewed changes

ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 14, 2020

ran-huang reviewed Sep 16, 2020

View reviewed changes

ran-huang added the translation/doing This PR’s assignee is translating this PR. label Sep 16, 2020

ran-huang self-assigned this Sep 16, 2020

lichunzhu added 2 commits September 16, 2020 12:00

address comments

621aa1b

Merge branch 'master' into updateTableFilterUsage

1f48651

ran-huang approved these changes Sep 16, 2020

View reviewed changes

ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Sep 16, 2020

ti-srebot approved these changes Sep 16, 2020

View reviewed changes

ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Sep 16, 2020

ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 16, 2020

ti-srebot merged commit 420af7f into pingcap:master Sep 17, 2020

ti-srebot pushed a commit to ti-srebot/docs-tidb-operator that referenced this pull request Sep 17, 2020

cherry pick pingcap#699 to release-1.1

7e957c8

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Sep 17, 2020

zh: update backup & restore table filter usage and bump tidb cluster version to v4.0.6 (#699) #705

Merged

7 tasks

ran-huang pushed a commit that referenced this pull request Sep 17, 2020

cherry pick #699 to release-1.1 (#705)

d9ff5b6

Signed-off-by: ti-srebot <ti-srebot@pingcap.com> Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn>

ran-huang mentioned this pull request Sep 17, 2020

en: update tableFilter usage and bump tidb to 4.0.6 #708

Merged

7 tasks

ran-huang added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Sep 17, 2020

ti-srebot mentioned this pull request Sep 21, 2020

en: update tableFilter usage and bump tidb to 4.0.6 (#708) #720

Merged

7 tasks

july2993 mentioned this pull request Oct 16, 2020

en, zh: bump tidb version to 4.0.7 #769

Merged

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zh: update backup & restore table filter usage and bump tidb cluster version to v4.0.6 #699

zh: update backup & restore table filter usage and bump tidb cluster version to v4.0.6 #699

lichunzhu commented Sep 14, 2020 •

edited

Loading

lichunzhu commented Sep 14, 2020

lichunzhu commented Sep 14, 2020

lichunzhu commented Sep 14, 2020

DanielZhangQD Sep 14, 2020

lichunzhu Sep 14, 2020

DanielZhangQD left a comment

ran-huang Sep 16, 2020

ran-huang Sep 16, 2020

ran-huang Sep 16, 2020

ran-huang Sep 16, 2020

ran-huang Sep 16, 2020

ran-huang commented Sep 16, 2020

ti-srebot commented Sep 16, 2020

ti-srebot commented Sep 17, 2020

	* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 dumpling 的配置时，`options` 字段的默认值如下：
	* `.spec.dumpling`：Dumpling 相关的配置，可以在 `options` 字段指定 Dumpling 的运行参数，详情见 [Dumpling 使用文档](https://docs.pingcap.com/zh/tidb/dev/dumpling-overview#dumpling-主要参数表)；默认情况下该字段可以不用配置。当不指定 Dumpling 的配置时，`options` 字段的默认值如下：

	> tableFilter 如果要写排除规则导出除 db.table 的所有表 "!db.table" 必须先添加 `.` 规则来导出所有表，如下面例子所示：
	> `tableFilter` 如果要写排除规则导出除 `db.table` 的所有表，`"!db.table"` 前必须先添加 `.` 规则来导出所有表，如下面例子所示：

zh: update backup & restore table filter usage and bump tidb cluster version to v4.0.6 #699

zh: update backup & restore table filter usage and bump tidb cluster version to v4.0.6 #699

Conversation

lichunzhu commented Sep 14, 2020 • edited Loading

What is changed, added or deleted? (Required)

Which TiDB Operator version(s) do your changes apply to? (Required)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

lichunzhu commented Sep 14, 2020

lichunzhu commented Sep 14, 2020

lichunzhu commented Sep 14, 2020

DanielZhangQD Sep 14, 2020

Choose a reason for hiding this comment

lichunzhu Sep 14, 2020

Choose a reason for hiding this comment

DanielZhangQD left a comment

Choose a reason for hiding this comment

ran-huang Sep 16, 2020

Choose a reason for hiding this comment

ran-huang Sep 16, 2020

Choose a reason for hiding this comment

ran-huang Sep 16, 2020

Choose a reason for hiding this comment

ran-huang Sep 16, 2020

Choose a reason for hiding this comment

ran-huang Sep 16, 2020

Choose a reason for hiding this comment

ran-huang commented Sep 16, 2020

ti-srebot commented Sep 16, 2020

ti-srebot commented Sep 17, 2020

lichunzhu commented Sep 14, 2020 •

edited

Loading