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.

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

mcs: collect scheduling statistics #7112

Merged
merged 4 commits into from
Oct 10, 2023
Merged

mcs: collect scheduling statistics #7112

merged 4 commits into from
Oct 10, 2023

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Sep 19, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: Ref #5839.

What is changed and how does it work?

This PR collects the statistics on the scheduling service and modifies Grafana template to make the monitor work as before.

Check List

Tests

  • Unit test

Release note

None.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 19, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • lhy1024

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 bot added the release-note-none Denotes a PR that doesn't merit a release note. label Sep 19, 2023
@ti-chi-bot ti-chi-bot bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 19, 2023
@rleungx rleungx requested review from JmPotato and lhy1024 and removed request for nolouch and disksing September 19, 2023 09:40
@codecov
Copy link

codecov bot commented Sep 19, 2023 •
edited
Loading

Codecov Report

Merging #7112 (d2813d7) into master (2556b5b) will decrease coverage by 0.02%.
Report is 1 commits behind head on master.
The diff coverage is 87.01%.

@@            Coverage Diff             @@
##           master    #7112      +/-   ##
==========================================
- Coverage   74.56%   74.54%   -0.02%     
==========================================
  Files         441      442       +1     
  Lines       47388    47436      +48     
==========================================
+ Hits        35335    35362      +27     
- Misses       8957     8972      +15     
- Partials     3096     3102       +6
Flag Coverage Δ
unittests 74.54% <87.01%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@ti-chi-bot ti-chi-bot bot added status/LGT1 Indicates that a PR has LGTM 1. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 20, 2023
@rleungx rleungx force-pushed the make-monitor-work branch 3 times, most recently from 58403e4 to 074797e Compare September 21, 2023 04:23
rleungx
rleungx commented Sep 21, 2023
View reviewed changes
metrics/grafana/pd.json
@@ -1663,7 +1663,7 @@
"tableColumn": "idalloc",
"targets": [
{
"expr": "pd_cluster_id{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", instance=\"$instance\", type=\"idalloc\"}",
"expr": "max(pd_cluster_id{k8s_cluster=\"$k8s_cluster\", tidb_cluster=\"$tidb_cluster\", type=\"idalloc\"})",
Copy link
Member Author

Choose a reason for hiding this comment

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

change to max

rleungx
rleungx commented Sep 21, 2023
View reviewed changes
metrics/grafana/pd.json
@@ -2202,7 +2202,7 @@
"tableColumn": "tso",
"targets": [
{
"expr": "pd_cluster_tso{instance=\"$instance\", type=\"tso\", dc=\"global\"}",
"expr": "max(pd_cluster_tso{type=\"tso\", dc=\"global\"})",
Copy link
Member Author

Choose a reason for hiding this comment

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

change to max

rleungx
rleungx commented Sep 21, 2023
View reviewed changes
metrics/grafana/pd.json
@@ -2508,7 +2508,7 @@
"tableColumn": "tso",
"targets": [
{
"expr": "pd_cluster_tso{instance=\"$instance\", type=\"tso\", dc=\"global\"}",
"expr": "max(pd_cluster_tso{type=\"tso\", dc=\"global\"})",
Copy link
Member Author

Choose a reason for hiding this comment

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

change to max

@rleungx rleungx mentioned this pull request Sep 27, 2023
Closed
@rleungx
collect scheduling statistics
f79e23f 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
remove instance
a5f0bbf 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
fix metrics
6167465 
Signed-off-by: Ryan Leung <[email protected]>
@rleungx
resolve conflicts
d2813d7 
Signed-off-by: Ryan Leung <[email protected]>
@ti-chi-bot ti-chi-bot bot removed the status/LGT1 Indicates that a PR has LGTM 1. label Oct 10, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT2 Indicates that a PR has LGTM 2. label Oct 10, 2023
@JmPotato
Copy link
Member

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Oct 10, 2023

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

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
Contributor

ti-chi-bot bot commented Oct 10, 2023

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

Commit hash: d2813d7

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 10, 2023
@ti-chi-bot ti-chi-bot bot merged commit 2266c94 into tikv:master Oct 10, 2023
26 checks passed
@rleungx rleungx deleted the make-monitor-work branch October 10, 2023 04:09
rleungx added a commit to rleungx/pd that referenced this pull request Dec 1, 2023
@rleungx
mcs: collect scheduling statistics (tikv#7112)
684c5ab 
ref tikv#5839

Signed-off-by: Ryan Leung <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lhy1024 lhy1024 lhy1024 approved these changes

@JmPotato JmPotato JmPotato approved these changes

Assignees
No one assigned
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rleungx @JmPotato @lhy1024