Skip to content

Commit 07ac081

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 97074af + 787b697 commit 07ac081

File tree

6 files changed

+40
-20
lines changed

6 files changed

+40
-20
lines changed

check-before-deployment.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -712,12 +712,17 @@ sudo systemctl enable ntpd.service
712712
713713
## 手动配置 SSH 互信及 sudo 免密码
714714
715-
对于有需求,通过手动配置中控机至目标节点互信的场景,可参考本段。通常推荐使用 TiUP 部署工具会自动配置 SSH 互信及免密登录,可忽略本段内容。
715+
本节介绍如何手动配置中控机到目标节点的 SSH 互信。如果你使用 TiUP 部署工具,SSH 互信和免密码登录会自动完成配置,可跳过本节。
716+
717+
在配置 SSH 互信时,建议在所有目标节点上创建并使用 `tidb` 用户。一般情况下,系统并不强制要求各节点上的用户相同。但在以下场景中,请注意用户一致性的要求:
718+
719+
- 使用备份恢复工具 (BR):强烈建议使用同一用户执行所有 BR 和 TiDB 相关操作。
720+
- 使用 NFS 等网络存储:需要确保该用户在所有节点上的 UID 和 GID 相同。NFS 通过底层 UID 和 GID 来识别文件访问权限,如果各节点的 UID 或 GID 不一致,或者执行 BR 的用户与运行 TiDB 的用户不同(尤其是在没有 `sudo` 权限时),备份或恢复过程中可能会出现权限被拒绝 (Permission Denied) 错误。
716721
717722
1. 以 `root` 用户依次登录到部署目标机器创建 `tidb` 用户并设置登录密码。
718723
719724
```bash
720-
useradd tidb && \
725+
useradd -m -d /home/tidb tidb
721726
passwd tidb
722727
```
723728

dynamic-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Query OK, 0 rows affected (0.01 sec)
8787
{{< copyable "sql" >}}
8888

8989
```sql
90-
set config tikv `log-level`='warn';
90+
set config tikv `log-level`='warn'; -- This command fails because `log-level` is incorrect. Use `log.level` instead.
9191
```
9292

9393
```sql

releases/_index.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,14 @@ aliases: ['/zh/tidb/stable/release-notes/','/zh/tidb/v8.5/release-notes/','/docs
291291

292292
## 1.0
293293

294-
- [1.0.8](https://docs.pingcap.com/tidb/dev/release-1.0.8): 2018-02-11
295-
- [1.0.7](https://docs.pingcap.com/tidb/dev/release-1.0.7): 2018-01-22
296-
- [1.0.6](https://docs.pingcap.com/tidb/dev/release-1.0.6): 2018-01-08
297-
- [1.0.5](https://docs.pingcap.com/tidb/dev/release-1.0.5): 2017-12-26
298-
- [1.0.4](https://docs.pingcap.com/tidb/dev/release-1.0.4): 2017-12-11
299-
- [1.0.3](https://docs.pingcap.com/tidb/dev/release-1.0.3): 2017-11-28
300-
- [1.0.2](https://docs.pingcap.com/tidb/dev/release-1.0.2): 2017-11-13
301-
- [1.0.1](https://docs.pingcap.com/tidb/dev/release-1.0.1): 2017-11-01
294+
- [1.0.8](https://docs.pingcap.com/tidb/stable/release-1.0.8): 2018-02-11
295+
- [1.0.7](https://docs.pingcap.com/tidb/stable/release-1.0.7): 2018-01-22
296+
- [1.0.6](https://docs.pingcap.com/tidb/stable/release-1.0.6): 2018-01-08
297+
- [1.0.5](https://docs.pingcap.com/tidb/stable/release-1.0.5): 2017-12-26
298+
- [1.0.4](https://docs.pingcap.com/tidb/stable/release-1.0.4): 2017-12-11
299+
- [1.0.3](https://docs.pingcap.com/tidb/stable/release-1.0.3): 2017-11-28
300+
- [1.0.2](https://docs.pingcap.com/tidb/stable/release-1.0.2): 2017-11-13
301+
- [1.0.1](https://docs.pingcap.com/tidb/stable/release-1.0.1): 2017-11-01
302302
- [1.0.0](/releases/release-1.0-ga.md): 2017-10-16
303303
- [Pre-GA](/releases/release-pre-ga.md): 2017-08-30
304304
- [rc4](/releases/release-rc.4.md): 2017-08-04

releases/release-timeline.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,15 +199,15 @@ summary: 了解 TiDB 的版本发布时间线。
199199
| [2.0.0-rc.3](/releases/release-2.0-rc.3.md) | 2018-03-23 |
200200
| [2.0.0-rc.1](/releases/release-2.0-rc.1.md) | 2018-03-09 |
201201
| [1.1.0-beta](/releases/release-1.1-beta.md) | 2018-02-24 |
202-
| [1.0.8](https://docs.pingcap.com/tidb/dev/release-1.0.8) | 2018-02-11 |
203-
| [1.0.7](https://docs.pingcap.com/tidb/dev/release-1.0.7) | 2018-01-22 |
202+
| [1.0.8](https://docs.pingcap.com/tidb/stable/release-1.0.8) | 2018-02-11 |
203+
| [1.0.7](https://docs.pingcap.com/tidb/stable/release-1.0.7) | 2018-01-22 |
204204
| [1.1.0-alpha](/releases/release-1.1-alpha.md) | 2018-01-19 |
205-
| [1.0.6](https://docs.pingcap.com/tidb/dev/release-1.0.6) | 2018-01-08 |
206-
| [1.0.5](https://docs.pingcap.com/tidb/dev/release-1.0.5) | 2017-12-26 |
207-
| [1.0.4](https://docs.pingcap.com/tidb/dev/release-1.0.4) | 2017-12-11 |
208-
| [1.0.3](https://docs.pingcap.com/tidb/dev/release-1.0.3) | 2017-11-28 |
209-
| [1.0.2](https://docs.pingcap.com/tidb/dev/release-1.0.2) | 2017-11-13 |
210-
| [1.0.1](https://docs.pingcap.com/tidb/dev/release-1.0.1) | 2017-11-01 |
205+
| [1.0.6](https://docs.pingcap.com/tidb/stable/release-1.0.6) | 2018-01-08 |
206+
| [1.0.5](https://docs.pingcap.com/tidb/stable/release-1.0.5) | 2017-12-26 |
207+
| [1.0.4](https://docs.pingcap.com/tidb/stable/release-1.0.4) | 2017-12-11 |
208+
| [1.0.3](https://docs.pingcap.com/tidb/stable/release-1.0.3) | 2017-11-28 |
209+
| [1.0.2](https://docs.pingcap.com/tidb/stable/release-1.0.2) | 2017-11-13 |
210+
| [1.0.1](https://docs.pingcap.com/tidb/stable/release-1.0.1) | 2017-11-01 |
211211
| [1.0.0](/releases/release-1.0-ga.md) | 2017-10-16 |
212212
| [Pre-GA](/releases/release-pre-ga.md) | 2017-08-30 |
213213
| [rc4](/releases/release-rc.4.md) | 2017-08-04 |

ticdc/ticdc-architecture.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,17 @@ TiCDC 新架构通过将整体架构拆分成有状态和无状态的两部分
6464

6565
> **注意:**
6666
>
67-
> 针对 MySQL Sink 的 Changefeed,除了满足上述任一条件,表还需要满足**有且仅有一个主键或非空唯一键**,才可以被 TiCDC 拆分并分发,以保证拆表模式下数据同步的正确性。
67+
> 针对 MySQL Sink 的 Changefeed,除了满足上述任一条件,表还需要满足**有且仅有一个主键或非空唯一键**,才可以被 TiCDC 拆分并分发,以保证表级任务拆分模式下数据同步的正确性。
68+
69+
### 表级任务拆分配置建议
70+
71+
切换至 TiCDC 新架构后,不建议继续使用老架构中的拆表相关配置。在绝大多数场景下,建议先采用新架构的默认配置。仅在存在同步性能瓶颈或调度不均的特殊场景下,再基于默认值进行小幅调整。
72+
73+
在拆表模式下,建议重点关注以下配置项:
74+
75+
- [`scheduler.region-threshold`](/ticdc/ticdc-changefeed-config.md#region-threshold):默认值为 `10000`。当表的 Region 数量超过该阈值时,TiCDC 会对该表执行拆分。对于 Region 数量较少但表整体写入流量较高的场景,可以适当降低该值。该参数必须大于或等于 `scheduler.region-count-per-span`,否则可能导致任务频繁调度,并增加同步延迟。
76+
- [`scheduler.region-count-per-span`](/ticdc/ticdc-changefeed-config.md#region-count-per-span-从-v854-版本开始引入):默认值为 `100`。在 Changefeed 初始化阶段,满足拆分条件的表会按照该参数进行拆分。拆分后,每个子表最多包含 `region-count-per-span` 个 Region。
77+
- [`scheduler.write-key-threshold`](/ticdc/ticdc-changefeed-config.md#write-key-threshold):默认值为 `0`(表示关闭)。当表的 Sink 写入流量超过该阈值时,TiCDC 会触发拆分。建议保持默认值 `0`
6878

6979
## 兼容性说明
7080

ticdc/ticdc-changefeed-config.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,11 @@ Info: {"upstream_id":7178706266519722477,"namespace":"default","id":"simple-repl
161161
- 默认为 `false`。设置为 `true` 以打开该功能。
162162
- 默认值:`false`
163163
164+
#### `region-count-per-span` <span class="version-mark">从 v8.5.4 版本开始引入</span>
165+
166+
- 在 [TiCDC 新架构](/ticdc/ticdc-architecture.md)中引入。在 Changefeed 初始化阶段,满足拆分条件的表会按照该参数进行拆分。拆分后,每个子表最多包含 `region-count-per-span` 个 Region。
167+
- 默认值:`100`。
168+
164169
#### `region-threshold`
165170
166171
- 默认值:对于 [TiCDC 新架构](/ticdc/ticdc-architecture.md),默认值为 `10000`;对于 [TiCDC 老架构](/ticdc/ticdc-classic-architecture.md),默认值为 `100000`。

0 commit comments

Comments
 (0)