Skip to content

*: fix several typos #17713

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
Merged
merged 2 commits into from
Jun 18, 2024
Merged

*: fix several typos #17713

merged 2 commits into from
Jun 18, 2024

Conversation

lilin90
Copy link
Member

@lilin90 lilin90 commented Jun 17, 2024 •
edited
Loading

What is changed, added or deleted? (Required)

Fix several typos

Note: For the typo in tikv_log_backup_interal_actor_acting_duration_sec (interal > internal), the code has been fixed in tikv/tikv#16931. And I confirmed with @3pointer that this fix applies to v6.5 and later versions.

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)
  • v8.2 (TiDB 8.2 versions)
  • v8.1 (TiDB 8.1 versions)
  • v8.0 (TiDB 8.0 versions)
  • v7.6 (TiDB 7.6 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 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)

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

@lilin90 lilin90 added translation/doing This PR’s assignee is translating this PR. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Jun 17, 2024
@lilin90 lilin90 requested a review from Oreoxmt June 17, 2024 10:25
@lilin90 lilin90 self-assigned this Jun 17, 2024
@ti-chi-bot ti-chi-bot bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 17, 2024
@Oreoxmt Oreoxmt added the type/bugfix This PR fixes a bug. label Jun 17, 2024
Oreoxmt
Oreoxmt reviewed Jun 17, 2024
View reviewed changes
Oreoxmt
Oreoxmt reviewed Jun 17, 2024
View reviewed changes
@lilin90 @Oreoxmt
Apply suggestions from code review
452131a 
Co-authored-by: Aolin <aolinz@outlook.com>
lilin90
lilin90 commented Jun 17, 2024
View reviewed changes
br/br-monitoring-and-alert.md
@@ -28,7 +28,7 @@ aliases: ['/zh/tidb/dev/pitr-monitoring-and-alert/']

| 指标 | 类型 | 说明 |
|-------------------------------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------------------|
| **tikv_log_backup_interal_actor_acting_duration_sec** | Histogram | 处理内部各种消息事件的耗时。<br/>`message :: TaskType` |
| **tikv_log_backup_internal_actor_acting_duration_sec** | Histogram | 处理内部各种消息事件的耗时。<br/>`message :: TaskType` |
Copy link
Member Author

@lilin90 lilin90 Jun 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Note: The code has been fixed in tikv/tikv#16931. I confirmed with @3pointer that this fix applies to v6.5 and later versions.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jun 17, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 17, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-06-17 10:46:08.356912474 +0000 UTC m=+25294.842401303: ☑️ agreed by Oreoxmt.

@lilin90 lilin90 added needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-7.6 lgtm labels Jun 18, 2024
lilin90
lilin90 commented Jun 18, 2024
View reviewed changes
Copy link
Member Author

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

/approve

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lilin90

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Jun 18, 2024
@ti-chi-bot ti-chi-bot bot merged commit 2b30f21 into pingcap:master Jun 18, 2024
7 checks passed
@lilin90 lilin90 deleted the fix-typos branch June 18, 2024 05:49
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 18, 2024
@lilin90 @ti-chi-bot
This is an automated cherry-pick of pingcap#17713
ba8f21c 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 18, 2024
Merged
17 tasks
ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 18, 2024
@lilin90 @ti-chi-bot
This is an automated cherry-pick of pingcap#17713
cddc15e 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Jun 18, 2024
Merged
17 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 18, 2024
@lilin90 @ti-chi-bot
This is an automated cherry-pick of pingcap#17713
3a29097 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 18, 2024
Merged
17 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 18, 2024
@lilin90 @ti-chi-bot
This is an automated cherry-pick of pingcap#17713
ce3860a 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 18, 2024
Merged
17 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 18, 2024
@lilin90 @ti-chi-bot
This is an automated cherry-pick of pingcap#17713
a28acf8 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 18, 2024
Merged
17 tasks
ti-chi-bot pushed a commit to ti-chi-bot/docs-cn that referenced this pull request Jun 18, 2024
@lilin90 @ti-chi-bot
This is an automated cherry-pick of pingcap#17713
3b55d81 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 18, 2024
Merged
17 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@ti-chi-bot
*: fix several typos (#17713) (#17720)
cf01174
ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@ti-chi-bot
*: fix several typos (#17713) (#17719)
701a467
ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@ti-chi-bot
*: fix several typos (#17713) (#17718)
0483b0a
ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@ti-chi-bot
*: fix several typos (#17713) (#17717)
17f2a65
ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@ti-chi-bot
*: fix several typos (#17713) (#17716)
32559bf
ti-chi-bot bot pushed a commit that referenced this pull request Jun 18, 2024
@ti-chi-bot
*: fix several typos (#17713) (#17715)
fda6437
@lilin90 lilin90 added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Jun 18, 2024
@lilin90 lilin90 mentioned this pull request Jun 18, 2024
Merged
17 tasks
This was referenced Jun 18, 2024
Merged
Merged
Merged
Merged
Merged
Merged
@lilin90 lilin90 added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR’s assignee is translating this PR. labels Jun 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Oreoxmt Oreoxmt Oreoxmt approved these changes

Assignees

@lilin90 lilin90

Labels
approved lgtm needs-1-more-lgtm Indicates a PR needs 1 more LGTM. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lilin90 @ti-chi-bot @Oreoxmt