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

bug fix: calculate limit rate bases on minute when mode is auto (#2822) #2826

Merged
merged 3 commits into from
Sep 1, 2020
Merged

bug fix: calculate limit rate bases on minute when mode is auto (#2822) #2826

merged 3 commits into from
Sep 1, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2822 to release-4.0

Signed-off-by: 1150310621 2604947873@qq.com

What problem does this PR solve?

when store limit mode is auto, tidb calculate limit rate on seconds and add it to schedule config mistakely.

What is changed and how it works?

return the calculated rate without divide by the store balance base time

Release note

  • Fix the unit of store limit rate when the mode is auto

@lee-qiu @ti-srebot
cherry pick tikv#2822 to release-4.0
1a21526 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2020
Merged
@ti-srebot ti-srebot added contribution Indicates that the PR was contributed by an external member. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick labels Aug 24, 2020
@ti-srebot ti-srebot added this to the v4.0.6 milestone Aug 24, 2020
@ti-srebot ti-srebot self-assigned this Aug 24, 2020
@codecov
Copy link

codecov bot commented Aug 24, 2020 •
edited
Loading

Codecov Report

Merging #2826 into release-4.0 will decrease coverage by 0.45%.
The diff coverage is 0.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2826      +/-   ##
===============================================
- Coverage        77.82%   77.36%   -0.46%     
===============================================
  Files              208      208              
  Lines            22762    22762              
===============================================
- Hits             17714    17610     -104     
- Misses            3718     3821     +103     
- Partials          1330     1331       +1
Impacted Files Coverage Δ
server/cluster/store_limiter.go 53.70% <0.00%> (ø)
server/statistics/store_collection.go 58.82% <0.00%> (-34.56%) ⬇️
server/kv/etcd_kv.go 75.32% <0.00%> (-9.10%) ⬇️
server/region_syncer/client.go 80.29% <0.00%> (-6.57%) ⬇️
server/region_syncer/server.go 80.55% <0.00%> (-3.48%) ⬇️
server/cluster/cluster.go 80.91% <0.00%> (-3.36%) ⬇️
server/config/persist_options.go 89.76% <0.00%> (-1.58%) ⬇️
server/member/leader.go 73.54% <0.00%> (-1.56%) ⬇️
server/schedule/operator_controller.go 81.41% <0.00%> (-0.68%) ⬇️
pkg/btree/btree.go 86.84% <0.00%> (-0.61%) ⬇️
... and 5 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 2a2c4ed...9d90902. Read the comment docs.

@ti-srebot ti-srebot added status/LGT1 Indicates that a PR has LGTM 1. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Aug 24, 2020
@rleungx
Copy link
Member

rleungx commented Aug 24, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 24, 2020
@rleungx rleungx removed the status/can-merge Indicates a PR has been approved by a committer. label Aug 24, 2020
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@rleungx
Copy link
Member

rleungx commented Sep 1, 2020

/merge

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

Your auto merge job has been accepted, waiting for:

  • 2874

@lhy1024 lhy1024 added the require-LGT1 Indicates that the PR requires an LGTM. label Sep 1, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2874

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2874
  • 2854

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2874
  • 2854

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2874
  • 2854

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2874
  • 2854

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2854

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024 lhy1024 merged commit ceef517 into tikv:release-4.0 Sep 1, 2020
This was referenced Sep 10, 2020
Merged
Merged
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

@nolouch nolouch Awaiting requested review from nolouch

@rleungx rleungx Awaiting requested review from rleungx

Assignees

@ti-srebot ti-srebot

Labels
contribution Indicates that the PR was contributed by an external member. require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Milestone
v4.0.6
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ti-srebot @rleungx @lhy1024 @lee-qiu