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

cluster: fix the bug that region statistics are not updated after flow-round-by-digit change (#4304) #4306

Merged
merged 5 commits into from
Nov 30, 2021
Merged

cluster: fix the bug that region statistics are not updated after flow-round-by-digit change (#4304) #4306

merged 5 commits into from
Nov 30, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4304

What problem does this PR solve?

fix #4295

What is changed and how it works?

A change in flowRoundDivisor also considers that the flow statistics have changed.

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix the bug that region statistics are not updated after `flow-round-by-digit` change.

@HunDunDM @ti-chi-bot
cluster: fix the bug that region statistics are not updated after flo…
5f95924 
…w-round-by-digit change

close tikv#4295

Signed-off-by: HunDunDM <hundundm@gmail.com>
@HunDunDM @ti-chi-bot
refine some code
32a8acf 
Signed-off-by: HunDunDM <hundundm@gmail.com>
@HunDunDM @ti-chi-bot
address comment
8e3329e 
Signed-off-by: HunDunDM <hundundm@gmail.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Nov 8, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • HunDunDM
  • 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 added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. component/cluster Cluster logic. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.2 The PR belongs to release-5.2 cherry pick. labels Nov 8, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 8, 2021
Merged
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 8, 2021
disksing
disksing reviewed Nov 9, 2021
View reviewed changes
server/core/region.go
@@ -550,7 +550,8 @@ func GenerateRegionGuideFunc(enableLog bool) RegionGuideFunc {
// Once flow has changed, will update the cache.
// Because keys and bytes are strongly related, only bytes are judged.
if region.GetRoundBytesWritten() != origin.GetRoundBytesWritten() ||
region.GetRoundBytesRead() != origin.GetRoundBytesRead() {
region.GetRoundBytesRead() != origin.GetRoundBytesRead() ||
region.flowRoundDivisor < origin.flowRoundDivisor {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why can we skip sync when divisor becomes greater?

@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 Nov 30, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 30, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/merge

@ti-chi-bot
Copy link
Member Author

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

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: 8e3329e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 30, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/run-unit-tests

@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/run-unit-tests

@codecov
Copy link

codecov bot commented Nov 30, 2021

Codecov Report

Merging #4306 (546365a) into release-5.2 (c135477) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release-5.2    #4306   +/-   ##
============================================
  Coverage        74.78%   74.78%           
============================================
  Files              249      249           
  Lines            25660    25662    +2     
============================================
+ Hits             19189    19192    +3     
+ Misses            4792     4786    -6     
- Partials          1679     1684    +5
Flag Coverage Δ
unittests 74.78% <100.00%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
server/core/region.go 91.54% <100.00%> (+0.01%) ⬆️
server/core/region_option.go 85.26% <100.00%> (+0.15%) ⬆️
server/grpc_service.go 47.45% <100.00%> (-0.23%) ⬇️
server/kv/etcd_kv.go 69.56% <0.00%> (-10.15%) ⬇️
pkg/dashboard/adapter/manager.go 82.97% <0.00%> (-7.45%) ⬇️
pkg/metricutil/metricutil.go 79.31% <0.00%> (-3.45%) ⬇️
server/election/leadership.go 83.90% <0.00%> (-3.45%) ⬇️
server/schedule/operator/step.go 68.10% <0.00%> (-1.67%) ⬇️
server/server.go 71.12% <0.00%> (-1.36%) ⬇️
server/tso/tso.go 60.22% <0.00%> (-1.11%) ⬇️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c135477...546365a. Read the comment docs.

@ti-chi-bot ti-chi-bot merged commit 6717f3f into tikv:release-5.2 Nov 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@disksing disksing disksing left review comments

@nolouch nolouch nolouch approved these changes

@HunDunDM HunDunDM HunDunDM approved these changes

@rleungx rleungx Awaiting requested review from rleungx

Assignees

@HunDunDM HunDunDM

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/cluster Cluster logic. release-note Denotes a PR that will be considered when it comes time to generate release notes. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. triage/accept type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.2 The PR belongs to release-5.2 cherry pick.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-chi-bot @nolouch @disksing @HunDunDM @zhouqiang-cl