how-to: add check-before-deployment.md#2656
Merged
Merged
Conversation
ran-huang
added
translation/from-docs-cn
yikeke
reviewed
Jun 3, 2020
yikeke
reviewed
Jun 3, 2020
| sysctl -p | ||
| ``` | ||
|
|
||
| ## Check and stop the firewall service of deployment machines |
Contributor
There was a problem hiding this comment.
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.
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
yikeke
reviewed
Jun 3, 2020
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
… into check-before-deploy
Contributor
Author
|
@yikeke Comments addressed. PTAL~ |
yikeke
reviewed
Jun 4, 2020
|
|
||
| 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. |
Contributor
There was a problem hiding this comment.
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
Contributor
Author
There was a problem hiding this comment.
@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.
Contributor
There was a problem hiding this comment.
We take the lowercase form then. Can you help unify the terms across our docs in this PR?
Co-authored-by: Keke Yi <40977455+yikeke@users.noreply.github.com>
Contributor
Author
|
@yikeke The two terms are unified. PTAL. |
yikeke
approved these changes
Jun 4, 2020
Contributor
|
/merge |
sre-bot
added
the
status/can-merge
Contributor
|
/run-all-tests |
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>
5 tasks
Contributor
|
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What is changed, added or deleted? (Required)
Add check-before-deployment.md
Which TiDB version(s) do your changes apply to? (Required)
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)?