checker: prevent the regions in split-cache from becoming the target of merge #3454

HunDunDM · 2021-03-04T18:14:13Z

What problem does this PR solve?

What is changed and how it works?

checker: prevent the regions in split-cache from becoming the target of merge

Check List

Tests

Unit test

Related changes

Need to cherry-pick to the release branch

Release note

checker: prevent the regions in split-cache from becoming the target of merge

…of merge Signed-off-by: HunDunDM <hundundm@gmail.com>

Signed-off-by: HunDunDM <hundundm@gmail.com>

HunDunDM · 2021-03-04T18:16:03Z

Originally, a unittest tested this bug, but due to many problems in the test code, the unittest failed to detect the bug.

HunDunDM · 2021-03-04T18:17:17Z

server/schedule/checker/merge_checker_test.go

@@ -122,8 +122,8 @@ func (s *testMergeCheckerSuite) SetUpTest(c *C) {
 				},
 			},
 			&metapb.Peer{Id: 109, StoreId: 4},
-			core.SetApproximateSize(10),
-			core.SetApproximateKeys(10),
+			core.SetApproximateSize(1),


Here, the original value 10 is greater than threshold 2, which causes the region to be unable to be merged.

HunDunDM · 2021-03-04T18:18:39Z

server/schedule/checker/merge_checker_test.go

@@ -191,10 +191,19 @@ func (s *testMergeCheckerSuite) TestBasic(c *C) {
 	c.Assert(ops, NotNil)
 	c.Assert(ops[0].RegionID(), Equals, s.regions[2].GetID())
 	c.Assert(ops[1].RegionID(), Equals, s.regions[1].GetID())
-	s.cluster.RuleManager.DeleteRule("test", "test")
+	s.cluster.RuleManager.DeleteRule("pd", "test")


The rule was not deleted correctly here, which caused the subsequent test to be invalid.

HunDunDM · 2021-03-04T18:20:29Z

server/schedule/checker/merge_checker_test.go

+	ops = s.mc.Check(s.regions[2])
+	c.Assert(ops, IsNil)
+
+	s.mc.startTime = time.Now().Add(-2 * time.Hour)


The original test did not modify the startTime. Due to the following code logic, all regions cannot be merged.

expireTime := m.startTime.Add(m.opts.GetSplitMergeInterval()) if time.Now().Before(expireTime) { checkerCounter.WithLabelValues("merge_checker", "recently-start").Inc() return nil }

codecov · 2021-03-04T18:26:01Z

Codecov Report

Merging #3454 (e1360d7) into master (0e15869) will decrease coverage by 0.12%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #3454      +/-   ##
==========================================
- Coverage   75.00%   74.87%   -0.13%     
==========================================
  Files         244      244              
  Lines       23556    23557       +1     
==========================================
- Hits        17667    17638      -29     
- Misses       4311     4331      +20     
- Partials     1578     1588      +10

Flag	Coverage Δ
unittests	`74.87% <100.00%> (-0.13%)`	⬇️

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

Impacted Files	Coverage Δ
server/schedule/checker/merge_checker.go	`75.86% <100.00%> (+3.76%)`	⬆️
server/tso/global_allocator.go	`70.14% <0.00%> (-6.72%)`	⬇️
server/tso/allocator_manager.go	`72.75% <0.00%> (-4.49%)`	⬇️
pkg/dashboard/adapter/manager.go	`80.43% <0.00%> (-4.35%)`	⬇️
server/member/member.go	`68.47% <0.00%> (-2.72%)`	⬇️
server/grpc_service.go	`57.26% <0.00%> (-1.17%)`	⬇️
server/core/storage.go	`67.68% <0.00%> (-0.77%)`	⬇️
server/cluster/cluster.go	`83.13% <0.00%> (-0.49%)`	⬇️
server/server.go	`71.98% <0.00%> (ø)`
server/handler.go	`42.46% <0.00%> (+0.49%)`	⬆️
... 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 0e15869...53907c4. Read the comment docs.

Yisaer

LGTM

ti-chi-bot · 2021-03-05T02:38:15Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

Yisaer
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.

Yisaer · 2021-03-05T02:38:35Z

/merge

ti-chi-bot · 2021-03-05T02:38:35Z

@Yisaer: 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 · 2021-03-05T02:38:37Z

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

Commit hash: c1c1e95

lhy1024 · 2021-03-05T02:39:46Z

/merge

ti-chi-bot · 2021-03-05T02:39:47Z

@lhy1024: 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 · 2021-03-05T03:29:37Z

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

At the same time I will also trigger all tests for you:

/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.

lhy1024 · 2021-03-05T06:01:08Z

/run-integration-ddl-test

HunDunDM · 2021-03-05T08:17:52Z

/run-integration-ddl-test

HunDunDM · 2021-03-08T10:56:00Z

/run-integration-ddl-test

HunDunDM · 2021-03-08T11:22:36Z

/run-integration-lightning-test

Rustin170506 · 2021-03-08T11:29:52Z

/run-integration-lightning-test

I think maybe this CI broken.

Rustin170506 · 2021-03-08T11:31:33Z

/run-integration-lightning-test

Or only "run-all-tests" can trigger it.

Rustin170506 · 2021-03-08T12:41:42Z

/run-all-tests

nolouch · 2021-03-09T10:24:10Z

/merge

ti-chi-bot · 2021-03-09T10:24:10Z

@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.

nolouch · 2021-03-09T13:25:43Z

/run-integration-ddl-test

nolouch · 2021-03-09T16:11:40Z

/merge

ti-chi-bot · 2021-03-09T16:11:42Z

@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.

nolouch · 2021-03-10T04:37:40Z

/merge

ti-chi-bot · 2021-03-10T04:37:41Z

@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.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2021-03-10T04:54:36Z

cherry pick to release-3.0 in PR #3458

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2021-03-10T04:56:21Z

cherry pick to release-4.0 in PR #3459

…of merge (#3454) (#3459) * cherry pick #3454 to release-4.0 Signed-off-by: ti-srebot <ti-srebot@pingcap.com> * fix Signed-off-by: HunDunDM <hundundm@gmail.com> Co-authored-by: 混沌DM <hundundm@gmail.com>

…of merge (#3454) (#3458) * cherry pick #3454 to release-3.0 Signed-off-by: ti-srebot <ti-srebot@pingcap.com> * revert Signed-off-by: HunDunDM <hundundm@gmail.com> * pick Signed-off-by: HunDunDM <hundundm@gmail.com> Co-authored-by: 混沌DM <hundundm@gmail.com> Co-authored-by: Ti Chi Robot <71242396+ti-chi-bot@users.noreply.github.com>

HunDunDM added 2 commits March 5, 2021 02:08

checker: prevent the regions in split-cache from becoming the target …

048da40

…of merge Signed-off-by: HunDunDM <hundundm@gmail.com>

fix many error in unit test

c1c1e95

Signed-off-by: HunDunDM <hundundm@gmail.com>

HunDunDM added needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch. component/checker Checker logic. type/bugfix This PR fixes a bug. needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. needs-cherry-pick-5.0-rc labels Mar 4, 2021

HunDunDM requested review from disksing and lhy1024 March 4, 2021 18:14

HunDunDM self-assigned this Mar 4, 2021

HunDunDM commented Mar 4, 2021

View reviewed changes

HunDunDM requested a review from nolouch March 4, 2021 18:33

lhy1024 approved these changes Mar 5, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 5, 2021

Yisaer approved these changes Mar 5, 2021

View reviewed changes

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 Mar 5, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 5, 2021

Merge branch 'master' into split-protection

53907c4

nolouch removed the needs-cherry-pick-5.0-rc label Mar 8, 2021

nolouch merged commit 722a665 into tikv:master Mar 10, 2021

ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Mar 10, 2021

cherry pick tikv#3454 to release-3.0

6a051df

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Mar 10, 2021

checker: prevent the regions in split-cache from becoming the target of merge (#3454) #3458

Merged

ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Mar 10, 2021

cherry pick tikv#3454 to release-4.0

9ca299d

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Mar 10, 2021

checker: prevent the regions in split-cache from becoming the target of merge (#3454) #3459

Merged

HunDunDM deleted the split-protection branch March 10, 2021 04:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

checker: prevent the regions in split-cache from becoming the target of merge #3454

checker: prevent the regions in split-cache from becoming the target of merge #3454

HunDunDM commented Mar 4, 2021

HunDunDM commented Mar 4, 2021

HunDunDM Mar 4, 2021

HunDunDM Mar 4, 2021

HunDunDM Mar 4, 2021

codecov bot commented Mar 4, 2021 •

edited

Loading

Yisaer left a comment

ti-chi-bot commented Mar 5, 2021

Yisaer commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

lhy1024 commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

lhy1024 commented Mar 5, 2021

HunDunDM commented Mar 5, 2021

HunDunDM commented Mar 8, 2021

HunDunDM commented Mar 8, 2021

Rustin170506 commented Mar 8, 2021

Rustin170506 commented Mar 8, 2021

Rustin170506 commented Mar 8, 2021

nolouch commented Mar 9, 2021

ti-chi-bot commented Mar 9, 2021

nolouch commented Mar 9, 2021

nolouch commented Mar 9, 2021

ti-chi-bot commented Mar 9, 2021

nolouch commented Mar 10, 2021

ti-chi-bot commented Mar 10, 2021

ti-srebot commented Mar 10, 2021

ti-srebot commented Mar 10, 2021

checker: prevent the regions in split-cache from becoming the target of merge #3454

checker: prevent the regions in split-cache from becoming the target of merge #3454

Conversation

HunDunDM commented Mar 4, 2021

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

HunDunDM commented Mar 4, 2021

HunDunDM Mar 4, 2021

Choose a reason for hiding this comment

HunDunDM Mar 4, 2021

Choose a reason for hiding this comment

HunDunDM Mar 4, 2021

Choose a reason for hiding this comment

codecov bot commented Mar 4, 2021 • edited Loading

Codecov Report

Yisaer left a comment

Choose a reason for hiding this comment

ti-chi-bot commented Mar 5, 2021

Yisaer commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

lhy1024 commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

ti-chi-bot commented Mar 5, 2021

lhy1024 commented Mar 5, 2021

HunDunDM commented Mar 5, 2021

HunDunDM commented Mar 8, 2021

HunDunDM commented Mar 8, 2021

Rustin170506 commented Mar 8, 2021

Rustin170506 commented Mar 8, 2021

Rustin170506 commented Mar 8, 2021

nolouch commented Mar 9, 2021

ti-chi-bot commented Mar 9, 2021

nolouch commented Mar 9, 2021

nolouch commented Mar 9, 2021

ti-chi-bot commented Mar 9, 2021

nolouch commented Mar 10, 2021

ti-chi-bot commented Mar 10, 2021

ti-srebot commented Mar 10, 2021

ti-srebot commented Mar 10, 2021

codecov bot commented Mar 4, 2021 •

edited

Loading