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

cluster: avoid unexpected statistic modify in range cluster (#3599) #3602

Merged
merged 3 commits into from
Apr 16, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 16, 2021

cherry-pick #3599 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In pd repo:
git pr https://github.com/tikv/pd/pull/3602

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/pd.git pr/3602:release-5.0-9097e68c4db5

Signed-off-by: lhy1024 admin@liudos.us

What problem does this PR solve?

After add the scatter range scheduler, will cause the #3598, the disk used space drop to 0. this PR try to fix a part of that.

What is changed and how it works?

#3598 are caused with two problems, this pr fix one, another is #3597

Check List

Tests

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

Release note

  • Avoid unexpected statistic modify after adding scatter region scheduler

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot added component/schedule Scheduling logic. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick labels Apr 16, 2021
@ti-chi-bot ti-chi-bot removed the status/LGT2 Indicates that a PR has LGTM 2. label Apr 16, 2021
@ti-chi-bot ti-chi-bot requested a review from rleungx April 16, 2021 05:31
@ti-srebot ti-srebot added this to the v5.0.1 milestone Apr 16, 2021
@ti-srebot
Copy link
Contributor Author

@lhy1024 you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 16, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 16, 2021
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • disksing
  • lhy1024

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Apr 16, 2021
@disksing
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

@disksing: 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

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

Commit hash: afd34de

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

lhy1024 commented Apr 16, 2021

/rebuild

@codecov
Copy link

codecov bot commented Apr 16, 2021

Codecov Report

Merging #3602 (afd34de) into release-5.0 (be06738) will decrease coverage by 0.01%.
The diff coverage is 80.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-5.0    #3602      +/-   ##
===============================================
- Coverage        74.65%   74.63%   -0.02%     
===============================================
  Files              245      245              
  Lines            24085    24094       +9     
===============================================
+ Hits             17980    17982       +2     
- Misses            4497     4500       +3     
- Partials          1608     1612       +4     
Flag Coverage Δ
unittests 74.63% <80.00%> (-0.02%) ⬇️

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

Impacted Files Coverage Δ
server/core/store_stats.go 77.77% <66.66%> (-1.17%) ⬇️
server/core/store_option.go 100.00% <100.00%> (ø)
server/schedule/range_cluster.go 87.03% <100.00%> (ø)
server/schedule/operator/step.go 67.44% <0.00%> (-1.67%) ⬇️
server/election/leadership.go 85.88% <0.00%> (-1.18%) ⬇️
server/core/storage.go 67.68% <0.00%> (-0.77%) ⬇️
server/server.go 72.29% <0.00%> (-0.61%) ⬇️
server/cluster/cluster.go 83.29% <0.00%> (-0.49%) ⬇️
pkg/tempurl/tempurl.go 60.00% <0.00%> (ø)
server/grpc_service.go 47.62% <0.00%> (ø)
... and 4 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 be06738...afd34de. Read the comment docs.

@lhy1024 lhy1024 merged commit a811014 into tikv:release-5.0 Apr 16, 2021
@lhy1024 lhy1024 deleted the release-5.0-9097e68c4db5 branch April 16, 2021 10:57
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. component/schedule Scheduling logic. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants