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

Fix alloc_bytes of ReadLimiter (#5852) #5930

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #5852

What problem does this PR solve?

Issue Number: close #5801

Problem Summary:

  1. The calculation of alloc_bytes is not right when the burst read traffic exceeds the limit and results in the I/O limiter-tuner not working well.
  2. After the burst read traffic exceeds the limit, the available_balance is negative (overdrawn), refillAndAlloc will refresh it periodically. However, ReadLimiter may not be called for a long time and refillAndAlloc will not be called either.

What is changed and how it works?

Before this PR:
image

Include this PR:
image

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

None

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Sep 16, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JinheLin
  • Lloyd-Pottiger

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 mentioned this pull request Sep 16, 2022
12 tasks
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Sep 16, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Sep 26, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Oct 8, 2022

CLA assistant check
All committers have signed the CLA.

@JinheLin
Copy link
Contributor

JinheLin commented Oct 8, 2022

/run-all-tests

@JaySon-Huang JaySon-Huang force-pushed the cherry-pick-5852-to-release-6.1 branch from c4f575f to 3086e5f Compare October 8, 2022 03:11
@JinheLin
Copy link
Contributor

JinheLin commented Oct 8, 2022

/run-all-tests

@JinheLin
Copy link
Contributor

JinheLin commented Oct 8, 2022

/run-integration-test

@JinheLin
Copy link
Contributor

JinheLin commented Oct 8, 2022

/run-unit-test

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 8, 2022

Coverage for changed files

Filename                                    Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/RateLimiter.cpp                      579               267    53.89%          47                13    72.34%         709               280    60.51%         330               148    55.15%
Encryption/RateLimiter.h                         71                 2    97.18%          28                 2    92.86%         105                20    80.95%          34                 6    82.35%
Encryption/tests/gtest_rate_limiter.cpp         316                60    81.01%          42                 0   100.00%         727                20    97.25%          56                10    82.14%
TestUtils/MockReadLimiter.h                       2                 0   100.00%           2                 0   100.00%           6                 0   100.00%           0                 0         -
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                           968               329    66.01%         119                15    87.39%        1547               320    79.31%         420               164    60.95%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18359      9782             46.72%    206327  97930        52.54%

full coverage report (for internal network access only)

@JinheLin
Copy link
Contributor

JinheLin commented Oct 8, 2022

/run-integration-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 8, 2022
@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 Oct 8, 2022
@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                    Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/RateLimiter.cpp                      579               267    53.89%          47                13    72.34%         709               280    60.51%         330               147    55.45%
Encryption/RateLimiter.h                         71                 2    97.18%          28                 2    92.86%         105                20    80.95%          34                 6    82.35%
Encryption/tests/gtest_rate_limiter.cpp         316                60    81.01%          42                 0   100.00%         727                20    97.25%          56                10    82.14%
TestUtils/MockReadLimiter.h                       2                 0   100.00%           2                 0   100.00%           6                 0   100.00%           0                 0         -
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                           968               329    66.01%         119                15    87.39%        1547               320    79.31%         420               163    61.19%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18359      9783             46.71%    206327  97948        52.53%

full coverage report (for internal network access only)

@JinheLin
Copy link
Contributor

JinheLin commented Oct 9, 2022

/merge

@ti-chi-bot
Copy link
Member Author

@JinheLin: 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
Member Author

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

Commit hash: 1d08682

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 9, 2022
@ti-chi-bot
Copy link
Member Author

@ti-chi-bot: 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
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                    Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/RateLimiter.cpp                      579               267    53.89%          47                13    72.34%         709               280    60.51%         330               147    55.45%
Encryption/RateLimiter.h                         71                 2    97.18%          28                 2    92.86%         105                20    80.95%          34                 6    82.35%
Encryption/tests/gtest_rate_limiter.cpp         316                61    80.70%          42                 0   100.00%         727                20    97.25%          56                10    82.14%
TestUtils/MockReadLimiter.h                       2                 0   100.00%           2                 0   100.00%           6                 0   100.00%           0                 0         -
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                           968               330    65.91%         119                15    87.39%        1547               320    79.31%         420               163    61.19%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18359      9782             46.72%    206327  97928        52.54%

full coverage report (for internal network access only)

@sre-bot
Copy link
Collaborator

sre-bot commented Oct 9, 2022

Coverage for changed files

Filename                                    Regions    Missed Regions     Cover   Functions  Missed Functions  Executed       Lines      Missed Lines     Cover    Branches   Missed Branches     Cover
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Encryption/RateLimiter.cpp                      579               267    53.89%          47                13    72.34%         709               280    60.51%         330               147    55.45%
Encryption/RateLimiter.h                         71                 2    97.18%          28                 2    92.86%         105                20    80.95%          34                 6    82.35%
Encryption/tests/gtest_rate_limiter.cpp         316                60    81.01%          42                 0   100.00%         727                20    97.25%          56                10    82.14%
TestUtils/MockReadLimiter.h                       2                 0   100.00%           2                 0   100.00%           6                 0   100.00%           0                 0         -
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
TOTAL                                           968               329    66.01%         119                15    87.39%        1547               320    79.31%         420               163    61.19%

Coverage summary

Functions  MissedFunctions  Executed  Lines   MissedLines  Cover
18370      9786             46.73%    206586  97944        52.59%

full coverage report (for internal network access only)

@ti-chi-bot ti-chi-bot merged commit 7668a60 into pingcap:release-6.1 Oct 9, 2022
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. release-note-none Denotes a PR that doesn't merit a release note. 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/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants