Skip to content

cherry-pick #2431 #2461 to release-5.0#2568

Merged
ti-chi-bot merged 8 commits intopingcap:release-5.0from
JaySon-Huang:add_query_id_5.0
Sep 1, 2021
Merged

cherry-pick #2431 #2461 to release-5.0#2568
ti-chi-bot merged 8 commits intopingcap:release-5.0from
JaySon-Huang:add_query_id_5.0

Conversation

@JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Aug 4, 2021 •
edited
Loading

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary:

What is changed and how it works?

cherry-pick these PR to release-5.0 branch

Changes:

  • Show snapshot lifetime in Grafana
  • Show query_id in logging
  • Fix deadlock introduced by 2431

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch:

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

Release note

  • No release note

@JaySon-Huang JaySon-Huang added this to the v5.0.4 milestone Aug 4, 2021
This was referenced Aug 4, 2021
Merged
Merged
@flowbehappy flowbehappy modified the milestones: v5.0.4, v5.0.5 Aug 4, 2021
@flowbehappy flowbehappy self-requested a review August 4, 2021 09:09
@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 4, 2021
@JaySon-Huang JaySon-Huang self-assigned this Aug 4, 2021
@JaySon-Huang
Resolve conflict
4c495e2 
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
@JaySon-Huang JaySon-Huang added CHERRY-PICK cherry pick type/bugfix This PR fixes a bug. labels Aug 4, 2021
@JaySon-Huang
Copy link
Contributor Author

JaySon-Huang commented Aug 4, 2021

/run-all-tests

@JaySon-Huang
Copy link
Contributor Author

JaySon-Huang commented Aug 4, 2021 

[2021-08-04T12:55:08.346Z] release-5.0-failpoint: Pulling from qa/tidb
[2021-08-04T12:56:04.608Z] received unexpected HTTP status: 500 Internal Server Error

Seems like a CI env error

@JaySon-Huang
Copy link
Contributor Author

JaySon-Huang commented Aug 4, 2021

/run-all-tests

1 similar comment
@JaySon-Huang
Copy link
Contributor Author

JaySon-Huang commented Aug 4, 2021

/run-all-tests

@JaySon-Huang JaySon-Huang modified the milestones: v5.0.5, v5.0.4 Aug 6, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 30, 2021
@JaySon-Huang
Copy link
Contributor Author

JaySon-Huang commented Sep 1, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 1, 2021

@JaySon-Huang: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

Details

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
Copy link
Member

ti-chi-bot commented Sep 1, 2021

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

DetailsCommit hash: 4c495e2

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 1, 2021
@ti-chi-bot ti-chi-bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 1, 2021
@ti-chi-bot ti-chi-bot removed the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Sep 1, 2021
@ti-chi-bot ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 1, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Sep 1, 2021

@JaySon-Huang: 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.

Details

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 merged commit 0d690ba into pingcap:release-5.0 Sep 1, 2021
@JaySon-Huang JaySon-Huang deleted the add_query_id_5.0 branch September 1, 2021 11:26
@windtalker windtalker mentioned this pull request Sep 6, 2021
Merged
windtalker added a commit that referenced this pull request Sep 6, 2021
@windtalker @JaySon-Huang
cherry-pick #2431 #2461 to release-5.0 (#2568) (#3013)
d573f71 
Co-authored-by: JaySon <tshent@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@flowbehappy flowbehappy flowbehappy approved these changes

Assignees

@JaySon-Huang JaySon-Huang

Labels

CHERRY-PICK cherry pick cherry-pick-approved Cherry pick PR approved by release team. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.

Projects

None yet

Milestone

v5.0.4

Development

Successfully merging this pull request may close these issues.

5 participants

@JaySon-Huang @ti-chi-bot @flowbehappy @zhouqiang-cl @ti-srebot