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

binlog: update documents for committs and passoword (#6271) #6641

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tidb-binlog/deploy-tidb-binlog.md
Original file line number Diff line number Diff line change
Expand Up @@ -566,9 +566,9 @@ Drainer="192.168.0.13"
[syncer.to]
host = "192.168.0.13"
user = "root"
# 如果你不想在配置文件中写明文密码,则可以使用 `./binlogctl -cmd encrypt -text string` 生成加密的密码
# 如果配置了 encrypted_password 且非空,那么配置的 password 不生效。encrypted_password 和 password 无法同时生效。
password = ""
# 使用 `./binlogctl -cmd encrypt -text string` 加密的密码
# encrypted_password 非空时 password 会被忽略
encrypted_password = ""
port = 3306

Expand Down
8 changes: 6 additions & 2 deletions tidb-binlog/tidb-binlog-configuration-file.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,12 @@ aliases: ['/docs-cn/stable/tidb-binlog/tidb-binlog-configuration-file/','/docs-c

### initial-commit-ts

* 指定从哪个 commit timestamp 之后开始同步。这个配置仅适用于初次开始同步的 Drainer 节点。如果下游已经有 checkpoint 存在,则会根据 checkpoint 里记录的时间进行同步。
* 默认:`-1`。Drainer 会从 PD 得到一个最新的 timestamp 作为初始时间。
* 指定从哪个事务提交时间点(事务的 commit ts) 之后开始同步。这个配置仅适用于初次开始同步的 Drainer 节点。如果下游已经有 checkpoint 存在,则会根据 checkpoint 里记录的时间进行同步。
* commit ts(即 commit timestamp)是 TiDB [事务](/transaction-overview.md)的提交时间点。该时间点是从 PD 获取的全局唯一递增的时间戳,作为当前事务的唯一 ID。典型的 `initial-commit-ts` 配置可以通过以下方式获得:
- BR 备份的元信息(即 backupmeta)中记录的 backup TS
- Dumpling 备份的元信息(即 metadata)中记录的 Pos
- PD Control 中 `tso` 命令返回的结果
* 默认:`-1`。Drainer 会从 PD 得到一个最新的 timestamp 作为初始时间。即从当前的时间点开始同步。

### synced-check-time

Expand Down