Skip to content

cherry-pick #2431 #2461 to release-5.1#2564

Merged
JaySon-Huang merged 2 commits intopingcap:release-5.1from
JaySon-Huang:add_query_id_5.1
Aug 4, 2021
Merged

cherry-pick #2431 #2461 to release-5.1#2564
JaySon-Huang merged 2 commits intopingcap:release-5.1from
JaySon-Huang:add_query_id_5.1

Conversation

@JaySon-Huang
Copy link
Contributor

@JaySon-Huang JaySon-Huang commented Aug 4, 2021

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.1 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 the type/bugfix This PR fixes a bug. label Aug 4, 2021
@JaySon-Huang
Copy link
Contributor Author

/run-all-tests

@JaySon-Huang
Copy link
Contributor Author

/run-all-tests

@JaySon-Huang JaySon-Huang added this to the v5.1.2 milestone Aug 4, 2021
@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 JaySon-Huang added the CHERRY-PICK cherry pick label Aug 4, 2021
@JaySon-Huang JaySon-Huang merged commit 9f65bd8 into pingcap:release-5.1 Aug 4, 2021
@JaySon-Huang JaySon-Huang deleted the add_query_id_5.1 branch August 4, 2021 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CHERRY-PICK cherry pick status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants