checker: fix the issue that a region does not merge to the sibling with smaller size #1723

disksing · 2019-09-02T12:17:21Z

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

What problem does this PR solve?

The target argument passed to checkTarget is always nil, so next and prev are never compared.

What is changed and how it works?

Make it right and clear and add test.

Check List

Tests

Unit test

Related changes

Need to cherry-pick to the release branch

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

codecov-io · 2019-09-02T12:27:31Z

Codecov Report

❗ No coverage uploaded for pull request base (master@a67b5db). Click here to learn what that means.
The diff coverage is 100%.

@@            Coverage Diff            @@
##             master    #1723   +/-   ##
=========================================
  Coverage          ?   76.68%           
=========================================
  Files             ?      158           
  Lines             ?    15580           
  Branches          ?        0           
=========================================
  Hits              ?    11947           
  Misses            ?     2611           
  Partials          ?     1022

Impacted Files	Coverage Δ
server/checker/merge_checker.go	`75.86% <100%> (ø)`

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 a67b5db...9e3d62b. Read the comment docs.

Connor1996

LGTM

sre-bot · 2019-09-03T07:51:47Z

cherry pick to release-3.0 in PR #1726

…th smaller size (#1723) (#1726) Signed-off-by: disksing <i@disksing.com>

* *: unify get store function everywhere (#1671) Signed-off-by: Ryan Leung <rleungx@gmail.com> * remove unnecessary parentheses * server: use leader lease to determine tso service validity (#1676) Signed-off-by: disksing <i@disksing.com> * change internal stat values to float64 * add pending operator influence * add metrics of pending influence * fix metrics * fix panic * adjust pending influence of balanceHotWrite * change weight of pending influence * test: fix tests (#1696) * test: fix region syncer test Signed-off-by: disksing <i@disksing.com> * decrease region rolling window; store pending influence in scheduler * add config-check flag for pd-server (#1695) Signed-off-by: cwen0 <cwenyin0@gmail.com> * decrease possiblility transfer hot write leader * change pending influence weight * add unstarted op metrics * add logs for debug * add log for debug * add logs for debug * add logs for debug * add logs for debug * add logs for debug * add logs for debug * add logs for debug * Revert "add logs for debug" This reverts commit e74c7a9. * add metrics for hotspot operators * operator: rewrite move region related functions (#1667) * add metrics for pending operators * *: support setting endKey for ScanRange (#1700) Signed-off-by: disksing <i@disksing.com> * fix bug * fix bug * fix bug * fix metrics thread-safe bug * fix logic bug * *: reduce some unnecessary parameters (#1698) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: Do not send an operator of a region wth a stale epoch (#1659) * schedule: Do not send an operator of a region wth a stale epoch Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: check the version changed by the operator self Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix unit test Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix to avoid dispatching a stale opstep Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refactor "ConsumeConfVer() int" to "ExpectConfVerChange() bool" Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: fix typo in comment Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * fix typo Co-Authored-By: Ryan Leung <rleungx@gmail.com> * dispatch: fix unittest Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refine format Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * server: fix the dead lock in scatter region (#1706) Signed-off-by: Ryan Leung <rleungx@gmail.com> * add drop time for operator * use IsDropped to recognize canceled ops * try to fix trans leader burst * try to fix trans leader burst * add zombie influence * change select src dst strategy; improve op_controller * change select src strategy * fix bug * tools: fix set namespace in pd-ctl (#1701) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tools: fix parse url without http prefix (#1703) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tests: support deadlock detection in make test (#1704) Signed-off-by: Ryan Leung <rleungx@gmail.com> * Makefile: fix failpoint enable (#1722) Signed-off-by: nolouch <nolouch@gmail.com> * checker: fix the issue that a region does not merge to the sibling with smaller size (#1723) Signed-off-by: disksing <i@disksing.com> * tools: balance region simulator (#1708) * scheduler: do not remove the operator when the step does not finish (#1715) Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * operator: fix the AddLearner config version judgment (#1732) Signed-off-by: nolouch <nolouch@gmail.com> * tools: fix TLS in pd control (#1729) Signed-off-by: Ryan Leung <rleungx@gmail.com> * syncer: support TLS for region syncer (#1728) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: fix a thread-safe bug and improve code (#1719)

* *: unify get store function everywhere (#1671) Signed-off-by: Ryan Leung <rleungx@gmail.com> * server: use leader lease to determine tso service validity (#1676) Signed-off-by: disksing <i@disksing.com> * test: fix tests (#1696) * test: fix region syncer test Signed-off-by: disksing <i@disksing.com> * add config-check flag for pd-server (#1695) Signed-off-by: cwen0 <cwenyin0@gmail.com> * operator: rewrite move region related functions (#1667) * *: support setting endKey for ScanRange (#1700) Signed-off-by: disksing <i@disksing.com> * *: reduce some unnecessary parameters (#1698) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: Do not send an operator of a region wth a stale epoch (#1659) * schedule: Do not send an operator of a region wth a stale epoch Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: check the version changed by the operator self Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix unit test Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix to avoid dispatching a stale opstep Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refactor "ConsumeConfVer() int" to "ExpectConfVerChange() bool" Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: fix typo in comment Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * fix typo Co-Authored-By: Ryan Leung <rleungx@gmail.com> * dispatch: fix unittest Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refine format Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * server: fix the dead lock in scatter region (#1706) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tools: fix set namespace in pd-ctl (#1701) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tools: fix parse url without http prefix (#1703) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tests: support deadlock detection in make test (#1704) Signed-off-by: Ryan Leung <rleungx@gmail.com> * Makefile: fix failpoint enable (#1722) Signed-off-by: nolouch <nolouch@gmail.com> * checker: fix the issue that a region does not merge to the sibling with smaller size (#1723) Signed-off-by: disksing <i@disksing.com> * tools: balance region simulator (#1708) * scheduler: do not remove the operator when the step does not finish (#1715) Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * operator: fix the AddLearner config version judgment (#1732) Signed-off-by: nolouch <nolouch@gmail.com> * tools: fix TLS in pd control (#1729) Signed-off-by: Ryan Leung <rleungx@gmail.com> * syncer: support TLS for region syncer (#1728) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: fix a thread-safe bug and improve code (#1719) * statistics: fix region flow calculation (#1688) Signed-off-by: jiyingtk <jiyingtk@mail.ustc.edu.cn> * makefile: improve deadlock-enable/disable (#1736) * api: fix missing keys statistic in region information (#1741) Signed-off-by: nolouch <nolouch@gmail.com> * *: update go version to 1.13 (#1742) Signed-off-by: disksing <i@disksing.com> * coordinator: add the operator cost time in log field (#1748) Signed-off-by: nolouch <nolouch@gmail.com>

checker: fix merge bug

bbb5943

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

disksing added the needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch. label Sep 2, 2019

disksing requested review from overvenus, Connor1996 and rleungx September 2, 2019 12:17

disksing changed the title ~~checker: fix merge bug~~ checker: fix the issue that a region does not merge to the sibling with smaller size Sep 2, 2019

nolouch approved these changes Sep 3, 2019

View reviewed changes

Merge branch 'master' into merge

9e3d62b

Connor1996 approved these changes Sep 3, 2019

View reviewed changes

disksing merged commit 7baffcb into tikv:master Sep 3, 2019

disksing deleted the merge branch September 3, 2019 07:50

sre-bot mentioned this pull request Sep 3, 2019

checker: fix the issue that a region does not merge to the sibling with smaller size (#1723) #1726

Merged

sre-bot added a commit that referenced this pull request Sep 4, 2019

checker: fix the issue that a region does not merge to the sibling wi…

b365c1d

…th smaller size (#1723) (#1726) Signed-off-by: disksing <i@disksing.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

checker: fix the issue that a region does not merge to the sibling with smaller size #1723

checker: fix the issue that a region does not merge to the sibling with smaller size #1723

disksing commented Sep 2, 2019

codecov-io commented Sep 2, 2019 •

edited

Loading

Connor1996 left a comment

sre-bot commented Sep 3, 2019

checker: fix the issue that a region does not merge to the sibling with smaller size #1723

checker: fix the issue that a region does not merge to the sibling with smaller size #1723

Conversation

disksing commented Sep 2, 2019

What problem does this PR solve?

What is changed and how it works?

Check List

codecov-io commented Sep 2, 2019 • edited Loading

Codecov Report

Connor1996 left a comment

Choose a reason for hiding this comment

sre-bot commented Sep 3, 2019

codecov-io commented Sep 2, 2019 •

edited

Loading