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.

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

store/helper, infoschema: fix the bug that cannot find down-peer (#24881) #24919

Merged
merged 2 commits into from
Sep 2, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented May 27, 2021

cherry-pick #24881 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24919

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/24919:release-5.0-96ab4a3f0a58

Signed-off-by: HunDunDM hundundm@gmail.com

What problem does this PR solve?

Issue Number: close #24879

Problem Summary:

The STATUS field data in the TIKV_REGION_PEERS table is incorrect.

What is changed and how it works?

What's Changed: Fix wrong struct definition

kvproto/proto/pdpb.proto#L308

  • Before
SELECT * FROM INFORMATION_SCHEMA.TIKV_REGION_PEERS WHERE PEER_ID=69;
+-----------+---------+----------+------------+-----------+--------+--------------+
| REGION_ID | PEER_ID | STORE_ID | IS_LEARNER | IS_LEADER | STATUS | DOWN_SECONDS |
+-----------+---------+----------+------------+-----------+--------+--------------+
|        54 |      69 |        1 |          0 |         0 | NORMAL |         NULL |
+-----------+---------+----------+------------+-----------+--------+--------------+
  • After
SELECT * FROM INFORMATION_SCHEMA.TIKV_REGION_PEERS WHERE PEER_ID=69;
+-----------+---------+----------+------------+-----------+--------+--------------+
| REGION_ID | PEER_ID | STORE_ID | IS_LEARNER | IS_LEADER | STATUS | DOWN_SECONDS |
+-----------+---------+----------+------------+-----------+--------+--------------+
|        54 |      69 |        1 |          0 |         0 | DOWN   |          325 |
+-----------+---------+----------+------------+-----------+--------+--------------+

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Release note

  • Fix the bug that TIKV_REGION_PEERS table did not have the correct DOWN status.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot requested a review from a team as a code owner May 27, 2021 05:30
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team May 27, 2021 05:30
@ti-chi-bot
Copy link
Member

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved (/lgtm + /merge) by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added sig/execution SIG execution size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.0-cherry-pick labels May 27, 2021
@ti-srebot ti-srebot added this to the v5.0.1 milestone May 27, 2021
@ti-srebot
Copy link
Contributor Author

@HunDunDM you're already a collaborator in bot's repo.

@ti-chi-bot
Copy link
Member

@disksing: Thanks for your review. The bot only counts /lgtm from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@wshwsh12 wshwsh12 removed their request for review June 3, 2021 03:58
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 16, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • djshow832
  • winoros

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 added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 16, 2021
@lzmhhh123 lzmhhh123 removed their request for review July 5, 2021 02:09
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 12, 2021
@djshow832
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@djshow832: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Sep 2, 2021
@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Sep 2, 2021
@djshow832
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e1b2a42

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 2, 2021
@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. sig/execution SIG execution size/S Denotes a PR that changes 10-29 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. type/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants