Skip to content

Conversation

@yikeke
Copy link
Contributor

@yikeke yikeke commented Apr 15, 2020

What is changed, added or deleted? (Required)

fix some details in tiup deployment doc

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)?

@yikeke yikeke added needs-cherry-pick-4.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Apr 15, 2020
Copy link
Contributor Author

@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.

@yikeke yikeke marked this pull request as ready for review April 18, 2020 12:53
@yikeke yikeke requested review from lilin90 and superlzs0476 April 18, 2020 13:00
@yikeke yikeke added the status/PTAL This PR is ready for reviewing. label Apr 18, 2020
Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>
@CLAassistant
Copy link

CLAassistant commented Apr 18, 2020

CLA assistant check
All committers have signed the CLA.

Co-Authored-By: Keke Yi <40977455+yikeke@users.noreply.github.com>
Copy link
Contributor

@superlzs0476 superlzs0476 left a comment

Choose a reason for hiding this comment

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

LGTM

deploy_dir: "/tidb-deploy"
data_dir: "/tidb-data"
# # Monitored variables are used to all the machine
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # Monitored variables are used to all the machine
# # Monitored variables are used to all the machines.

# deploy_dir: "/tidb-deploy/monitored-9100"
# data_dir: "/tidb-data/monitored-9100"
# log_dir: "/tidb-deploy/monitored-9100/log"
# # Server configs are used to specify the runtime configuration of TiDB components
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # Server configs are used to specify the runtime configuration of TiDB components
# # Server configs are used to specify the runtime configuration of TiDB components.

# # All configuration items use points to represent the hierarchy, e.g:
# # readpool.storage.use-unified-pool
# # ^ ^
# # You can overwrite this configuration via instance-level `config` field
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # You can overwrite this configuration via instance-level `config` field
# # You can overwrite this configuration via the instance-level `config` field.

# data_dir: /tidb-data/tiflash-9000
# log_dir: /tidb-deploy/tiflash-9000/log
# numa_node: "0,1"
# # Config is used to overwrite the `server_configs.tiflash` values
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # Config is used to overwrite the `server_configs.tiflash` values
# # Config is used to overwrite the `server_configs.tiflash` values.

# - host: 10.0.1.17
# port: 8249
# data_dir: "/tidb-data/drainer-8249"
# # if drainer doesn't have checkpoint, use initial commitTS to initial checkpoint
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # if drainer doesn't have checkpoint, use initial commitTS to initial checkpoint
# # If drainer doesn't have any checkpoint, using initial commitTS to initialize the checkpoint

# port: 8249
# data_dir: "/tidb-data/drainer-8249"
# # if drainer doesn't have checkpoint, use initial commitTS to initial checkpoint
# # will get a latest timestamp from pd if setting to be -1 (default -1)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # will get a latest timestamp from pd if setting to be -1 (default -1)
# # will get a latest timestamp from pd if `commit_ts` is set to -1 (default -1).

# deploy_dir: "/tidb-deploy/drainer-8249"
# log_dir: "/tidb-deploy/drainer-8249/log"
# numa_node: "0,1"
# # Config is used to overwrite the `server_configs.drainer` values
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# # Config is used to overwrite the `server_configs.drainer` values
# # Config is used to overwrite the `server_configs.drainer` values.

Co-Authored-By: Lilian Lee <lilin@pingcap.com>
@yikeke
Copy link
Contributor Author

yikeke commented Apr 20, 2020

For those code comment issues, I will ask @lonng to refine the configuration file template and then open another PR to fix the issues in this document. FYI. @lilin90 @superlzs0476

Copy link
Member

@lilin90 lilin90 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
Copy link
Contributor Author

yikeke commented Apr 20, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 20, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 20, 2020

/run-all-tests

@sre-bot sre-bot merged commit 7def406 into pingcap:master Apr 20, 2020
sre-bot pushed a commit to sre-bot/docs that referenced this pull request Apr 20, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 20, 2020

cherry pick to release-4.0 in PR #2333

@yikeke yikeke deleted the fix-tiup-deploy branch April 20, 2020 04:18
yikeke added a commit that referenced this pull request Apr 20, 2020
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@yikeke
Copy link
Contributor Author

yikeke commented Apr 21, 2020

For those code comment issues, I will ask @lonng to refine the configuration file template and then open another PR to fix the issues in this document. FYI. @lilin90 @superlzs0476

The template issues are fixed in Fix grammar and format for topology.example.yaml by yikeke · pingcap-incubator/tiup-cluster. I'll open another PR in docs/docs-cn to update the docs.

@yikeke
Copy link
Contributor Author

yikeke commented Apr 21, 2020

For those code comment issues, I will ask @lonng to refine the configuration file template and then open another PR to fix the issues in this document. FYI. @lilin90 @superlzs0476

The template issues are fixed in Fix grammar and format for topology.example.yaml by yikeke · pingcap-incubator/tiup-cluster. I'll open another PR in docs/docs-cn to update the docs.

docs/docs-cn updates:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/can-merge Indicates a PR has been approved by a committer. status/PTAL This PR is ready for reviewing. 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.

5 participants