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

core: fix region size update (#2979) #2985

Merged
merged 7 commits into from
Sep 21, 2020
Merged

core: fix region size update (#2979) #2985

merged 7 commits into from
Sep 21, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2979 to release-4.0

Signed-off-by: disksing i@disksing.com

What problem does this PR solve?

Fix #2975

What is changed and how it works?

  • don't update, remove old + insert new
  • add test

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

  • Fix the statistical deviation of region size and region keys after region merge

@disksing @ti-srebot
cherry pick tikv#2979 to release-4.0
506d807 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Sep 17, 2020
Merged
@ti-srebot ti-srebot added status/LGT4 The PR has already had 4 LGTM. type/bugfix This PR fixes a bug. type/cherry-pick labels Sep 17, 2020
@ti-srebot ti-srebot added this to the v4.0.7 milestone Sep 17, 2020
nolouch
nolouch reviewed Sep 17, 2020
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-srebot ti-srebot added status/LGT1 Indicates that a PR has LGTM 1. and removed status/LGT4 The PR has already had 4 LGTM. labels Sep 17, 2020
@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Sep 17, 2020
HunDunDM
HunDunDM approved these changes Sep 17, 2020
View reviewed changes
Copy link
Member

@HunDunDM HunDunDM 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-srebot ti-srebot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Sep 17, 2020
@codecov
Copy link

codecov bot commented Sep 17, 2020 •
edited
Loading

Codecov Report

Merging #2985 into release-4.0 will increase coverage by 0.27%.
The diff coverage is 67.42%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2985      +/-   ##
===============================================
+ Coverage        77.16%   77.44%   +0.27%     
===============================================
  Files              204      209       +5     
  Lines            21940    22864     +924     
===============================================
+ Hits             16931    17707     +776     
- Misses            3724     3821      +97     
- Partials          1285     1336      +51
Impacted Files Coverage Δ
client/metrics.go 100.00% <ø> (ø)
pkg/apiutil/apiutil.go 67.34% <ø> (ø)
pkg/cache/cache.go 0.00% <ø> (ø)
pkg/cache/fifo.go 100.00% <ø> (ø)
pkg/cache/lru.go 80.35% <ø> (ø)
pkg/cache/two_queue.go 66.66% <ø> (ø)
pkg/codec/codec.go 78.57% <ø> (ø)
pkg/component/manager.go 81.01% <ø> (ø)
pkg/dashboard/adapter/redirector.go 94.23% <ø> (ø)
pkg/dashboard/keyvisual/input/core.go 33.33% <ø> (ø)
... and 207 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 07e429b...69ab5b5. Read the comment docs.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 18, 2020

/merge

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

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@disksing
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2967
  • 2980

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2980
  • 2977
  • 2994
  • 2991

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2994
  • 2991
  • 2977
  • 2994
  • 2991

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-all-tests

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-integration-ddl-test

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-integration-lightning-test

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-integration-compatibility-test

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-integration-ddl-test

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@HunDunDM
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-integration-lightning-test

1 similar comment
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 21, 2020

/run-integration-lightning-test

@HunDunDM
Copy link
Member

/rebuild

@lhy1024 lhy1024 merged commit ae4d9a6 into tikv:release-4.0 Sep 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolouch nolouch nolouch left review comments

@HunDunDM HunDunDM HunDunDM approved these changes

@lhy1024 lhy1024 lhy1024 approved these changes

@rleungx rleungx Awaiting requested review from rleungx

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees

@disksing disksing

Labels
status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
v4.0.7
Development

Successfully merging this pull request may close these issues.
5 participants
@ti-srebot @lhy1024 @disksing @HunDunDM @nolouch