Skip to content

Conversation

@ran-huang
Copy link
Contributor

What is changed, added or deleted? (Required)

Add check-before-deployment.md

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

@ran-huang ran-huang added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-4.0 labels Jun 1, 2020
@ran-huang ran-huang requested review from superlzs0476 and yikeke June 1, 2020 14:05
sysctl -p
```

## Check and stop the firewall service of deployment machines
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
## Check and stop the firewall service of deployment machines
## Check and stop the firewall service of target machines

In docs-cn repo, @kissmydb once suggested that we unify the terms and use "中控机" and "目标机器" (instead of "部署机"). So in docs repo, I suggest we use "Control Machine" and "Target Machine" (instead of "deployment machine") across our documents. @ran-huang Please update all places that apply to this suggestion.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated.

ran-huang and others added 6 commits June 3, 2020 17:58
@ran-huang
Copy link
Contributor Author

@yikeke Comments addressed. PTAL~


This section describes how to manually configure the SSH mutual trust and sudo without password. It is recommended to use TiUP for deployment, which automatically configure SSH mutual trust and login without password. If you deploy TiDB clusters using TiUP, ignore this section.

1. Log in to the Target Machine respectively using the `root` user account, create the `tidb` user and set the login password.
Copy link
Contributor

@yikeke yikeke Jun 4, 2020

Choose a reason for hiding this comment

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

Suggested change
1. Log in to the Target Machine respectively using the `root` user account, create the `tidb` user and set the login password.
1. Log in to the target machines respectively using the `root` user account, create the `tidb` user and set the login password.

s/Target Machine/target machine in batch @ran-huang

I think "control machine" and "target machine" can both use the lowercase form, what do you think? @ran-huang

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 Personally I think either uppercase or lowercase is okay. Now we use mostly Control Machine and target machine in our docs. Better unify them.

Copy link
Contributor

Choose a reason for hiding this comment

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

We take the lowercase form then. Can you help unify the terms across our docs in this PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure.

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.

Rest LGTM

ran-huang and others added 2 commits June 4, 2020 16:18
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ran-huang
Copy link
Contributor Author

@yikeke The two terms are unified. PTAL.

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.

rest LGTM

@yikeke
Copy link
Contributor

yikeke commented Jun 4, 2020

/merge

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

sre-bot commented Jun 4, 2020

/run-all-tests

@sre-bot sre-bot merged commit 8a6411d into pingcap:master Jun 4, 2020
sre-bot pushed a commit to sre-bot/docs that referenced this pull request Jun 4, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor

sre-bot commented Jun 4, 2020

cherry pick to release-4.0 in PR #2680

ran-huang added a commit that referenced this pull request Jun 4, 2020
* cherry pick #2656 to release-4.0

Signed-off-by: sre-bot <sre-bot@pingcap.com>

* resolve 3 conflicts

* Update upgrade-tidb-using-ansible.md

Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>

Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
@ran-huang ran-huang deleted the check-before-deploy branch July 30, 2020 06:13
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. 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