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

tikv: distinguish server timeout for TiKV and TiFlash #23700

Merged
merged 8 commits into from
May 6, 2021

Conversation

LittleFall
Copy link
Contributor

@LittleFall LittleFall commented Mar 30, 2021

What problem does this PR solve?

This pr is a follow-up of #21109

Problem Summary: Some TiFlash server time out still show TiKV server timeout.

What is changed and how it works?

What's Changed:

Fix it in batch cop requests.

Related changes

Check List

Tests

  • Integration test
  • Manual test (add detailed scripts or steps below)
create table t(a int);
alter table t set tiflash replica 1;
-- let TiFlash hang, for example, pause it while debugging.
explain analyze select * from t; -- cop
[HY000][9012] TiFlash server timeout
explain analyze select count(*) from t; -- batch, before this pr, it's [9002] TiKV server timeout
[HY000][9012] TiFlash server timeout

Side effects

Release note

  • Fix a bug that causes TiDB to report TiKV server timeout when executing TiFlash batch request.

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 30, 2021
@LittleFall
Copy link
Contributor Author

/run-check_dev

@LittleFall
Copy link
Contributor Author

/run-all-tests

@LittleFall
Copy link
Contributor Author

/cc @hanfei1991 , @lzmhhh123

@LittleFall
Copy link
Contributor Author

/cc @hanfei1991

@ti-chi-bot ti-chi-bot requested a review from hanfei1991 March 30, 2021 13:28
@LittleFall
Copy link
Contributor Author

/cc @lzmhhh123

@ti-chi-bot ti-chi-bot requested a review from lzmhhh123 March 30, 2021 13:29
Copy link
Contributor

@djshow832 djshow832 left a comment

Choose a reason for hiding this comment

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

Can you add some test cases?

Co-authored-by: djshow832 <zhangming@pingcap.com>
@djshow832
Copy link
Contributor

/lgtm

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 1, 2021
@LittleFall
Copy link
Contributor Author

/label type/bug-fix

@ti-chi-bot
Copy link
Member

@LittleFall: The label(s) type/bug-fix cannot be applied. These labels are supported: CHANGELOG, challenge-program, compatibility-breaker, contribution, correctness, first-time-contributor, good-first-issue, hacktoberfest, high-performance, hptc, need-more-info, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, needs-cherry-pick-5.0-rc, needs-cherry-pick-5.0, proposal, release-note, require-LGT3, security, tools.

In response to this:

/label type/bug-fix

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.

@LittleFall
Copy link
Contributor Author

/type bug-fix

@ti-chi-bot ti-chi-bot added the type/bugfix This PR fixes a bug. label Apr 6, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • djshow832
  • lzmhhh123

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Apr 6, 2021
@lzmhhh123
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: a4f83b5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 6, 2021
@LittleFall
Copy link
Contributor Author

/label cherry-pick-approved

@ti-chi-bot
Copy link
Member

@LittleFall: The label(s) cherry-pick-approved cannot be applied. These labels are supported: CHANGELOG, challenge-program, compatibility-breaker, contribution, correctness, first-time-contributor, good-first-issue, hacktoberfest, high-performance, hptc, need-more-info, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, needs-cherry-pick-5.0-rc, needs-cherry-pick-5.0, proposal, release-note, require-LGT3, security, tools.

In response to this:

/label cherry-pick-approved

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.

@lzmhhh123 lzmhhh123 added this to the v4.0.13 milestone Apr 6, 2021
@djshow832
Copy link
Contributor

/cc @zhouqiang-cl

@ti-chi-bot ti-chi-bot requested a review from zhouqiang-cl April 15, 2021 06:29
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 30, 2021
@ti-chi-bot
Copy link
Member

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

@sre-bot
Copy link
Contributor

sre-bot commented May 6, 2021

Please follow PR Title Format:

  • pkg [, pkg2, pkg3]: what's changed

Or if the count of mainly changed packages are more than 3, use

  • *: what's changed

@ti-chi-bot ti-chi-bot merged commit 77c32ba into pingcap:release-4.0 May 6, 2021
@LittleFall LittleFall deleted the tiflash-server-timeout branch May 20, 2021 11:31
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. size/XS Denotes a PR that changes 0-9 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/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants