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

resource_control: fix consumption less zero #6983

Merged
merged 5 commits into from
Sep 1, 2023
Merged

resource_control: fix consumption less zero #6983

merged 5 commits into from
Sep 1, 2023

Conversation

CabinfeverB
Copy link
Member

What problem does this PR solve?

Issue Number: Close #6973

What is changed and how does it work?

Check List

Tests

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

Code changes

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

Release note

None.

@CabinfeverB
fix consumption less zero
d36d48c 
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Aug 24, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HuSharp
  • nolouch

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 release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Aug 24, 2023
@ti-chi-bot ti-chi-bot bot requested review from HunDunDM and JmPotato August 24, 2023 04:45
@CabinfeverB CabinfeverB requested review from nolouch and HuSharp and removed request for HunDunDM August 24, 2023 04:45
@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Aug 24, 2023
HuSharp
HuSharp reviewed Aug 24, 2023
View reviewed changes
client/resource_group/controller/model.go
Comment on lines +240 to +254
func updateDeltaConsumption(last *rmpb.Consumption, now *rmpb.Consumption) *rmpb.Consumption {
delta := &rmpb.Consumption{}
if now.RRU >= last.RRU {
delta.RRU = now.RRU - last.RRU
last.RRU = now.RRU
}
if now.WRU >= last.WRU {
delta.WRU = now.WRU - last.WRU
last.WRU = now.WRU
}
if now.ReadBytes >= last.ReadBytes {
delta.ReadBytes = now.ReadBytes - last.ReadBytes
last.ReadBytes = now.ReadBytes
}
if now.WriteBytes >= last.WriteBytes {
Copy link
Member

Choose a reason for hiding this comment

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

if now with {ReadBytes: 100, WriteBytes: 0}, last is {ReadBytes: 50, WriteBytes: 50}
Maybe make last's parms not consistent, does it make sense?

Copy link
Member Author

Choose a reason for hiding this comment

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

We can assume that the various consumption stored in 'last' is monotonically increasing, and the inconsistency problem is not a big problem, I want to make sure that there are no more statistics RU. If the workload is ongoing and we are counting real consumption, then this discrepancy will be quickly eliminated as well.

@CabinfeverB
fix consumption less zero
f05976f 
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
nolouch
nolouch approved these changes Aug 31, 2023
View reviewed changes
Copy link
Contributor

@nolouch nolouch left a comment

Choose a reason for hiding this comment

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

lgtm

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 31, 2023
HuSharp
HuSharp approved these changes Sep 1, 2023
View reviewed changes
Copy link
Member

@HuSharp HuSharp left a comment

Choose a reason for hiding this comment

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

LGTM!

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 1, 2023
@nolouch
Copy link
Contributor

nolouch commented Sep 1, 2023

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 1, 2023

@nolouch: 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 Sep 1, 2023

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

Commit hash: b67d4e6

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 1, 2023
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Sep 1, 2023

@CabinfeverB: Your PR was out of date, I have automatically updated it for you.

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.

@ti-chi-bot ti-chi-bot bot merged commit ee8654e into tikv:master Sep 1, 2023
19 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #7033.

@ti-chi-bot ti-chi-bot mentioned this pull request Sep 1, 2023
Merged
ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Sep 1, 2023
@CabinfeverB @ti-chi-bot
This is an automated cherry-pick of tikv#6983
1a6209f 
close tikv#6973

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Sep 5, 2023
@ti-chi-bot @CabinfeverB @HuSharp
resource_control: fix consumption less zero (#6983) (#7033)
113cded 
close #6973

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>

Co-authored-by: Yongbo Jiang <cabinfeveroier@gmail.com>
Co-authored-by: Cabinfever_B <cabinfeveroier@gmail.com>
Co-authored-by: Hu# <jinhao.hu@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolouch nolouch nolouch approved these changes

@HuSharp HuSharp HuSharp approved these changes

@JmPotato JmPotato Awaiting requested review from JmPotato

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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.

master: pd panic during running workload with multiple resource groups
4 participants
@CabinfeverB @nolouch @ti-chi-bot @HuSharp