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

server, metrics: remove the connection count on server, only use the metrics (#51996) #53056

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #51996

What problem does this PR solve?

Issue Number: close #51889

Problem Summary:

  1. The connection count is not correct, if the session resets the resource group manually.
  2. Maintaining a separated map on server to count the connection for each resource group seems to be not necessary. We can use the GaugeVec itself. The connection count is not used anywhere else.
  3. The grafana panel of connection count is confusing. I added a legend and now it looks like:

image

Maybe someone prefers to sum up them together. Actually I think both are fine, feel free to comment your opinion.

Personally, I don't like the idea to use the uncontrollable string as a label 🤦, because the prometheus will have much greater pressure when these labels multiply together.

As for now, it seems not a big issue, but it'll become much worse if anyone adds more similar labels.

What changed and how does it work?

  1. Use the GaugeVec as the only counter of the connection.
  2. Also increase and decrease the counter when the user set resource group manually.
  3. Modify the grafana definition. I found that some modification on the json file is not represented in the jsonnet, so I also fix them.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Release note

Fix the issue that the connection count is not calculated and shown correctly.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels May 7, 2024
@ti-chi-bot ti-chi-bot added cherry-pick-approved Cherry pick PR approved by release team. labels May 7, 2024
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed do-not-merge/cherry-pick-not-approved size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 7, 2024
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels May 21, 2024
Signed-off-by: Yang Keao <[email protected]>
@YangKeao YangKeao force-pushed the cherry-pick-51996-to-release-7.5 branch from ed95a71 to 6590ea3 Compare May 21, 2024 09:11
Copy link

codecov bot commented May 21, 2024

Codecov Report

Attention: Patch coverage is 98.83721% with 1 lines in your changes are missing coverage. Please review.

Please upload report for BASE (release-7.5@1cc3f9b). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #53056   +/-   ##
================================================
  Coverage               ?   72.0054%           
================================================
  Files                  ?       1411           
  Lines                  ?     410234           
  Branches               ?          0           
================================================
  Hits                   ?     295391           
  Misses                 ?      94984           
  Partials               ?      19859           
Flag Coverage Δ
unit 72.0054% <98.8372%> (?)

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

Components Coverage Δ
dumpling 53.9913% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.4109% <0.0000%> (?)

@YangKeao YangKeao requested a review from tiancaiamao May 21, 2024 14:00
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels May 22, 2024
Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

ti-chi-bot bot commented May 22, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tiancaiamao, YangKeao

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [YangKeao,tiancaiamao]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels May 22, 2024
Copy link

ti-chi-bot bot commented May 22, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-05-22 07:34:14.626476586 +0000 UTC m=+2243408.383612151: ☑️ agreed by tiancaiamao.
  • 2024-05-22 07:34:50.446954573 +0000 UTC m=+2243444.204090146: ☑️ agreed by YangKeao.

@ti-chi-bot ti-chi-bot bot merged commit abf0783 into pingcap:release-7.5 May 23, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants