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.

Sign up for GitHub

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

Jump to bottom

ticdc: add doc about config #3745

Merged
merged 11 commits into from
Jul 3, 2020
Merged

ticdc: add doc about config #3745

merged 11 commits into from
Jul 3, 2020

Conversation

overvenus
Copy link
Member

What is changed, added or deleted? (Required)

Add doc about TiCDC config.

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

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

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

  • This PR is translated from: N/A
  • Other reference link(s): N/A

@overvenus
ticdc: add doc about config
2fe6d78 
Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus overvenus requested a review from amyangfei June 19, 2020 08:14
@amyangfei amyangfei mentioned this pull request Jun 19, 2020
Closed
18 tasks
@yikeke yikeke requested a review from TomShawn June 19, 2020 08:32
@yikeke yikeke added needs-cherry-pick-4.0 translation/welcome Waits for a contributor to translate this PR and create a PR to the pingcap/docs-cn repository. labels Jun 19, 2020
@overvenus
no tabs
b52ad90 
Signed-off-by: Neil Shen <overvenus@gmail.com>
@TomShawn TomShawn self-assigned this Jun 19, 2020
@TomShawn TomShawn added translation/doing This PR’s assignee is translating this PR. and removed translation/welcome Waits for a contributor to translate this PR and create a PR to the pingcap/docs-cn repository. labels Jun 19, 2020
amyangfei
amyangfei reviewed Jun 19, 2020
View reviewed changes
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
@TomShawn TomShawn added the size/small Changes of a small size. label Jun 22, 2020
@overvenus @amyangfei
Update ticdc/manage-ticdc.md
c72402e 
Co-authored-by: amyangfei <amyangfei@gmail.com>
amyangfei
amyangfei approved these changes Jun 22, 2020
View reviewed changes
Copy link
Contributor

@amyangfei amyangfei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@amyangfei amyangfei added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 22, 2020
@TomShawn
Copy link
Contributor

@overvenus Please resolve the conflict.

TomShawn
TomShawn suggested changes Jun 24, 2020
View reviewed changes
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated
case-sensitive = true

[filter]
# 忽略指定 StartTs 的事务
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# 忽略指定 StartTs 的事务
# 忽略指定 star_ts 的事务

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"start ts" is a term in tidb.

ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated
protocol = "default"

[cyclic-replication]
# 是否开启环形复制
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

环形同步还是复制呢？

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

“同步”

ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated

### 配置文件兼容注意事项

* 4.0.0 移除了 `ignore-txn-commit-ts`，添加了 `ignore-txn-start-ts`，使用 start ts 过滤事务。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* 4.0.0 移除了 `ignore-txn-commit-ts`，添加了 `ignore-txn-start-ts`，使用 start ts 过滤事务。
* TiDB v4.0.0 中移除了 `ignore-txn-commit-ts`，添加了 `ignore-txn-start-ts`，使用 start_ts 过滤事务。

ticdc/manage-ticdc.md Outdated
### 配置文件兼容注意事项

* 4.0.0 移除了 `ignore-txn-commit-ts`，添加了 `ignore-txn-start-ts`，使用 start ts 过滤事务。
* 4.0.2 移除了 `db-dbs`/`db-tables`/`ignore-dbs`/`ignore-tables`，添加了 `rules`，使用新版的数据库数据表过滤规则，[详细语法参考](https://github.com/pingcap/tidb-tools/blob/master/pkg/table-filter/README.md)。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* 4.0.2 移除了 `db-dbs`/`db-tables`/`ignore-dbs`/`ignore-tables`，添加了 `rules`，使用新版的数据库数据表过滤规则，[详细语法参考](https://github.com/pingcap/tidb-tools/blob/master/pkg/table-filter/README.md)。
* TiDB v4.0.2 中移除了 `db-dbs`/`db-tables`/`ignore-dbs`/`ignore-tables`，添加了 `rules`，使用新版的数据库和数据表过滤规则，详细语法参考 [Table Filter](https://github.com/pingcap/tidb-tools/blob/master/pkg/table-filter/README.md)。

ticdc/manage-ticdc.md Outdated
enable = false
# 当前 CDC 的复制 ID
replica-id = 1
# 需要过滤掉的复制 ID
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

overvenus
overvenus commented Jun 28, 2020
View reviewed changes
ticdc/manage-ticdc.md Outdated
case-sensitive = true

[filter]
# 忽略指定 StartTs 的事务
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"start ts" is a term in tidb.

ticdc/manage-ticdc.md Outdated
protocol = "default"

[cyclic-replication]
# 是否开启环形复制
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

“同步”

ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
@overvenus @TomShawn
Apply suggestions from code review
16bd86b 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@overvenus
Copy link
Member Author

PTAL @TomShawn , thanks!

TomShawn
TomShawn reviewed Jun 28, 2020
View reviewed changes
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
@overvenus @TomShawn
Update ticdc/manage-ticdc.md
16f388a 
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@zier-one zier-one requested a review from TomShawn July 2, 2020 07:22
TomShawn
TomShawn reviewed Jul 2, 2020
View reviewed changes
ticdc/manage-ticdc.md Outdated

如需设置更多同步任务的配置，比如指定同步单个数据表，请参阅[同步任务配置文件描述](#同步任务配置文件描述)。

使用方法如下：
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

什么的使用方法呢？建议具体一些。Rest LGTM

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已更新，麻烦尽快 review 下

overvenus
overvenus commented Jul 3, 2020
View reviewed changes
ticdc/manage-ticdc.md Outdated Show resolved Hide resolved
TomShawn
TomShawn approved these changes Jul 3, 2020
View reviewed changes
Copy link
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot
Copy link
Contributor

@TomShawn,Thanks for your review.

@TomShawn TomShawn added status/can-merge Indicates a PR has been approved by a committer. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 3, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@overvenus merge failed.

@TomShawn TomShawn removed the status/can-merge Indicates a PR has been approved by a committer. label Jul 3, 2020
@TomShawn
Copy link
Contributor

TomShawn commented Jul 3, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 3, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 3677b6c into pingcap:master Jul 3, 2020
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Jul 3, 2020
@overvenus @ti-srebot
cherry pick pingcap#3745 to release-4.0
76131a2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 3, 2020
Merged
5 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3870

ti-srebot added a commit that referenced this pull request Jul 3, 2020
@ti-srebot @overvenus
ticdc: add doc about config (#3745) (#3870)
b2f9e68 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Neil Shen <overvenus@gmail.com>
@overvenus overvenus deleted the cdc/config branch July 3, 2020 08:39
@TomShawn TomShawn 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 Jul 8, 2020
@TomShawn TomShawn mentioned this pull request Jul 8, 2020
Merged
5 tasks
@ti-srebot ti-srebot mentioned this pull request Jul 14, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TomShawn TomShawn TomShawn approved these changes

@zier-one zier-one zier-one left review comments

@amyangfei amyangfei amyangfei approved these changes

Assignees

@TomShawn TomShawn

Labels
size/small Changes of a small size. status/can-merge Indicates a PR has been approved by a committer. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@overvenus @TomShawn @ti-srebot @amyangfei @zier-one @yikeke