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

tiup: fix the scale-out yaml example #13327

Merged
merged 1 commit into from
Apr 24, 2023
Merged

tiup: fix the scale-out yaml example #13327

merged 1 commit into from
Apr 24, 2023

Conversation

Oreoxmt
Copy link
Collaborator

@Oreoxmt Oreoxmt commented Apr 24, 2023 •
edited
Loading

First-time contributors' checklist

What is changed, added or deleted? (Required)

The scale-out.yml example is inaccurate. This PR updates some examples:

  • Modify the file name from scale-out.yaml to scale-out.yml
  • Modify the deploy_dir from /data/deploy/install/deploy/... to /tidb-deploy/...
  • Modify the data_dir from /data/deploy/install/data/... to /tidb-data/...
  • Modify the log_dir from /data/deploy/install/log/... to /tidb-deploy/.../log

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

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v7.1 (TiDB 7.1 versions)
  • v7.0 (TiDB 7.0 versions)
  • v6.6 (TiDB 6.6 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

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

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@Oreoxmt
tiup: fix the scale-out yaml example
fbf4a85 
Signed-off-by: Aolin <aolin.zhang@pingcap.com>
@Oreoxmt Oreoxmt added type/bugfix This PR fixes a bug. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. area/tiup Indicates that the Issue or PR belongs to the area of the TiUP tool. ONCALL Relates to documentation oncall. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. area/deploy-upgrade-maintain Indicates that the Issue or PR belongs to the area of deployment, upgrade, and maintenance. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-6.6 labels Apr 24, 2023
@Oreoxmt Oreoxmt requested a review from kaaaaaaang April 24, 2023 05:47
@Oreoxmt Oreoxmt self-assigned this Apr 24, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 24, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • ran-huang

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 24, 2023
@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Apr 24, 2023

/status LGT1

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 24, 2023
@Oreoxmt Oreoxmt requested a review from ran-huang April 24, 2023 06:13
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 24, 2023
@Oreoxmt
Copy link
Collaborator Author

Oreoxmt commented Apr 24, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 24, 2023

This pull request has been accepted and is ready to merge.

Commit hash: fbf4a85

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 24, 2023
@Oreoxmt Oreoxmt mentioned this pull request Apr 24, 2023
Closed
@ti-chi-bot ti-chi-bot bot merged commit d4713e7 into pingcap:master Apr 24, 2023
@Oreoxmt Oreoxmt deleted the translate/docs-cn-13775 branch April 24, 2023 06:44
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 24, 2023
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.0: #13328.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 24, 2023
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-5.4: #13329.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Apr 24, 2023
@Oreoxmt @ti-chi-bot
This is an automated cherry-pick of pingcap#13327
0eed046 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 24, 2023
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.1: #13330.

ti-chi-bot pushed a commit to ti-chi-bot/docs that referenced this pull request Apr 24, 2023
@Oreoxmt @ti-chi-bot
This is an automated cherry-pick of pingcap#13327
1174835 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 24, 2023
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #13331.

@ti-chi-bot ti-chi-bot mentioned this pull request Apr 24, 2023
Merged
16 tasks
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.6: #13332.

ti-chi-bot bot pushed a commit that referenced this pull request Apr 24, 2023
@ti-chi-bot @Oreoxmt
tiup: fix the scale-out yaml example (#13327) (#13329)
d1fa020 
* This is an automated cherry-pick of #13327

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* Restore tiup/tiup-component-cluster-check.md

* Delete migrate-from-op-tidb.md

* Restore ticdc/deploy-ticdc.md

---------

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Co-authored-by: Aolin <aolin.zhang@pingcap.com>
Co-authored-by: Aolin <aolinz@outlook.com>
ti-chi-bot bot pushed a commit that referenced this pull request Apr 24, 2023
@ti-chi-bot @Oreoxmt
tiup: fix the scale-out yaml example (#13327) (#13330)
5149730 
* This is an automated cherry-pick of #13327

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* Restore ticdc/deploy-ticdc.md

* Restore tiup/tiup-component-cluster-check.md

---------

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Co-authored-by: Aolin <aolin.zhang@pingcap.com>
Co-authored-by: Aolin <aolinz@outlook.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kaaaaaaang kaaaaaaang kaaaaaaang approved these changes

@ran-huang ran-huang ran-huang approved these changes

Assignees

@Oreoxmt Oreoxmt

Labels
area/deploy-upgrade-maintain Indicates that the Issue or PR belongs to the area of deployment, upgrade, and maintenance. area/tiup Indicates that the Issue or PR belongs to the area of the TiUP tool. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. ONCALL Relates to documentation oncall. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Oreoxmt @ti-chi-bot @ran-huang @kaaaaaaang