Skip to content

Conversation

@toutdesuite
Copy link
Contributor

@toutdesuite toutdesuite commented Apr 21, 2020

What is changed, added or deleted? (Required)

TiUP: fix grammar and format for topology.example.yaml

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)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-4.0, needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

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

@toutdesuite toutdesuite requested a review from yikeke April 21, 2020 09:24
@toutdesuite toutdesuite added needs-cherry-pick-4.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Apr 21, 2020
# # Global variables are applied to all deployments and as the default value of
# # them if the specific deployment value missing.
# # Global variables are applied to all deployments and used as the default value of
# # The deployments if a specific deployment value is missing.
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
# # The deployments if a specific deployment value is missing.
# # the deployments if a specific deployment value is missing.

Please see my commits and comment in pingcap/docs-cn#2846 and align them in this PR. Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@yikeke The file is updated. PTAL

# log_dir: "/tidb-deploy/pump-8249/log"
# numa_node: "0,1"
# # Config is used to overwrite the `server_configs.drainer` values
# # The following configs are used to overwrite the `server_configs.pd` values.
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
# # The following configs are used to overwrite the `server_configs.pd` values.
# # The following configs are used to overwrite the `server_configs.drainer` values.

# log_dir: "/tidb-deploy/drainer-8249/log"
# numa_node: "0,1"
# # Config is used to overwrite the `server_configs.drainer` values
# # The following configs are used to overwrite the `server_configs.pd` values.
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
# # The following configs are used to overwrite the `server_configs.pd` values.
# # The following configs are used to overwrite the `server_configs.drainer` values.

deploy_dir: "/tidb-deploy/pump-8249"
data_dir: "/tidb-data/pump-8249"
# Config is used to overwrite the `server_configs.drainer` values
# The following configs are used to overwrite the `server_configs.pd` values.
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

deploy_dir: "/tidb-deploy/pump-8249"
data_dir: "/tidb-data/pump-8249"
# Config is used to overwrite the `server_configs.drainer` values
# The following configs are used to overwrite the `server_configs.pd` values.
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

deploy_dir: "/tidb-deploy/pump-8249"
data_dir: "/tidb-data/pump-8249"
# Config is used to overwrite the `server_configs.drainer` values
# The following configs are used to overwrite the `server_configs.pd` values.
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

commit_ts: -1
deploy_dir: "/tidb-deploy/drainer-8249"
# Config is used to overwrite the `server_configs.drainer` values
# The following configs are used to overwrite the `server_configs.pd` values.
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

log_dir: "deploy/tidb-4000/log"
numa_node: "0,1"
# Config is used to overwrite the `server_configs.tidb` values
# The following configs are used to overwrite the `server_configs.pd` values.
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto

Copy link
Contributor

@yikeke yikeke left a comment

Choose a reason for hiding this comment

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

LGTM

@yikeke yikeke merged commit 0624cb1 into pingcap:master Apr 21, 2020
sre-bot pushed a commit to sre-bot/docs that referenced this pull request Apr 21, 2020
* Fix grammar and format for topology.example.yaml

* address comments

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update quick-start-with-tidb.md
@sre-bot
Copy link
Contributor

sre-bot commented Apr 21, 2020

cherry pick to release-4.0 in PR #2361

yikeke pushed a commit that referenced this pull request Apr 21, 2020
* Fix grammar and format for topology.example.yaml

* address comments

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update tiup.md

* Update quick-start-with-tidb.md

Co-authored-by: toutdesuite <guizhiluo2014@163.com>
@toutdesuite toutdesuite deleted the modify-topology.yaml branch April 21, 2020 12:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants