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

operator: fix the AddLearner config version judgment #1732

Merged
merged 1 commit into from
Sep 5, 2019
Merged

operator: fix the AddLearner config version judgment #1732

merged 1 commit into from
Sep 5, 2019

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Sep 5, 2019

Signed-off-by: nolouch [email protected]

What problem does this PR solve?

Fix a bug, AddLearner should be always config changed in the check.

What is changed and how it works?

adjust the check logic.

Check List

Tests

  • Unit test

@nolouch nolouch added the type/bug The issue is confirmed as a bug. label Sep 5, 2019
@nolouch nolouch changed the title operator: fix the AddLearner config verssion judgment operator: fix the AddLearner config version judgment Sep 5, 2019
@codecov-io
Copy link

Codecov Report

Merging #1732 into master will decrease coverage by 0.2%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1732      +/-   ##
==========================================
- Coverage   76.93%   76.72%   -0.21%     
==========================================
  Files         160      160              
  Lines       15730    15730              
==========================================
- Hits        12102    12069      -33     
- Misses       2619     2636      +17     
- Partials     1009     1025      +16
Impacted Files Coverage Δ
server/schedule/operator/operator.go 85.04% <100%> (-0.91%) ⬇️
pkg/etcdutil/etcdutil.go 76.81% <0%> (-11.6%) ⬇️
server/region_syncer/client.go 75.94% <0%> (-7.6%) ⬇️
server/tso/tso.go 81.65% <0%> (-1.84%) ⬇️
server/server.go 81.83% <0%> (-1.53%) ⬇️
server/core/storage.go 76.08% <0%> (-1.45%) ⬇️
client/client.go 65.77% <0%> (-1.24%) ⬇️
server/config/option.go 91.85% <0%> (-0.75%) ⬇️
server/core/region.go 93.08% <0%> (-0.7%) ⬇️
... 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 144031c...0017f69. Read the comment docs.

lhy1024
lhy1024 approved these changes Sep 5, 2019
View reviewed changes
Copy link
Contributor

@lhy1024 lhy1024 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. The stale does not reappear, and the balance region can be finished normally.

@nolouch nolouch added the status/can-merge Indicates a PR has been approved by a committer. label Sep 5, 2019
@sre-bot
Copy link
Contributor

sre-bot commented Sep 5, 2019

/run-all-tests

@sre-bot sre-bot merged commit 38ff102 into tikv:master Sep 5, 2019
@nolouch nolouch deleted the fix-config-change branch September 5, 2019 10:09
Luffbee added a commit that referenced this pull request Sep 9, 2019
@Luffbee
[new-hotspot-scheduler] add operator influence and more metrics (#1713)
83ab4c2 
* *: unify get store function everywhere (#1671)

Signed-off-by: Ryan Leung <[email protected]>

* remove unnecessary parentheses

*  server: use leader lease to determine tso service validity (#1676)

Signed-off-by: disksing <[email protected]>

* 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 <[email protected]>

* decrease region rolling window; store pending influence in scheduler

* add config-check flag for pd-server (#1695)

Signed-off-by: cwen0 <[email protected]>

* 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 <[email protected]>

* fix bug

* fix bug

* fix bug

* fix metrics thread-safe bug

* fix logic bug

* *: reduce some unnecessary parameters (#1698)

Signed-off-by: Ryan Leung <[email protected]>

* 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 <[email protected]>

* schedule: check the version changed by the operator self

Signed-off-by: Shafreeck Sea <[email protected]>

* schedule: fix unit test

Signed-off-by: Shafreeck Sea <[email protected]>

* schedule: fix to avoid dispatching a stale opstep

Signed-off-by: Shafreeck Sea <[email protected]>

* dispatch: refactor "ConsumeConfVer() int" to "ExpectConfVerChange() bool"

Signed-off-by: Shafreeck Sea <[email protected]>

* dispatch: fix typo in comment

Signed-off-by: Shafreeck Sea <[email protected]>

* fix typo

Co-Authored-By: Ryan Leung <[email protected]>

* dispatch: fix unittest

Signed-off-by: Shafreeck Sea <[email protected]>

* dispatch: refine format

Signed-off-by: Shafreeck Sea <[email protected]>

* server: fix the dead lock in scatter region (#1706)

Signed-off-by: Ryan Leung <[email protected]>

* 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 <[email protected]>

* tools: fix parse url without http prefix (#1703)

Signed-off-by: Ryan Leung <[email protected]>

* tests: support deadlock detection in make test (#1704)

Signed-off-by: Ryan Leung <[email protected]>

* Makefile: fix failpoint enable (#1722)

Signed-off-by: nolouch <[email protected]>

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

Signed-off-by: disksing <[email protected]>

* tools: balance region simulator (#1708)

* scheduler: do not remove the operator when the step does not finish (#1715)

Signed-off-by: Shafreeck Sea <[email protected]>

* operator: fix the AddLearner config version judgment (#1732)

Signed-off-by: nolouch <[email protected]>

* tools: fix TLS in pd control (#1729)

Signed-off-by: Ryan Leung <[email protected]>

* syncer: support TLS for region syncer (#1728)

Signed-off-by: Ryan Leung <[email protected]>

* schedule: fix a thread-safe bug and improve code (#1719)
Luffbee added a commit that referenced this pull request Sep 11, 2019
@Luffbee
[new-hotspot-scheduler] merge master (#1752)
bcfcada 
* *: unify get store function everywhere (#1671)

Signed-off-by: Ryan Leung <[email protected]>

*  server: use leader lease to determine tso service validity (#1676)

Signed-off-by: disksing <[email protected]>

* test: fix tests (#1696)

* test: fix region syncer test

Signed-off-by: disksing <[email protected]>

* add config-check flag for pd-server (#1695)

Signed-off-by: cwen0 <[email protected]>

* operator: rewrite move region related functions (#1667)

* *: support setting endKey for ScanRange (#1700)

Signed-off-by: disksing <[email protected]>

* *: reduce some unnecessary parameters (#1698)

Signed-off-by: Ryan Leung <[email protected]>

* 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 <[email protected]>

* schedule: check the version changed by the operator self

Signed-off-by: Shafreeck Sea <[email protected]>

* schedule: fix unit test

Signed-off-by: Shafreeck Sea <[email protected]>

* schedule: fix to avoid dispatching a stale opstep

Signed-off-by: Shafreeck Sea <[email protected]>

* dispatch: refactor "ConsumeConfVer() int" to "ExpectConfVerChange() bool"

Signed-off-by: Shafreeck Sea <[email protected]>

* dispatch: fix typo in comment

Signed-off-by: Shafreeck Sea <[email protected]>

* fix typo

Co-Authored-By: Ryan Leung <[email protected]>

* dispatch: fix unittest

Signed-off-by: Shafreeck Sea <[email protected]>

* dispatch: refine format

Signed-off-by: Shafreeck Sea <[email protected]>

* server: fix the dead lock in scatter region (#1706)

Signed-off-by: Ryan Leung <[email protected]>

* tools: fix set namespace in pd-ctl (#1701)

Signed-off-by: Ryan Leung <[email protected]>

* tools: fix parse url without http prefix (#1703)

Signed-off-by: Ryan Leung <[email protected]>

* tests: support deadlock detection in make test (#1704)

Signed-off-by: Ryan Leung <[email protected]>

* Makefile: fix failpoint enable (#1722)

Signed-off-by: nolouch <[email protected]>

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

Signed-off-by: disksing <[email protected]>

* tools: balance region simulator (#1708)

* scheduler: do not remove the operator when the step does not finish (#1715)

Signed-off-by: Shafreeck Sea <[email protected]>

* operator: fix the AddLearner config version judgment (#1732)

Signed-off-by: nolouch <[email protected]>

* tools: fix TLS in pd control (#1729)

Signed-off-by: Ryan Leung <[email protected]>

* syncer: support TLS for region syncer (#1728)

Signed-off-by: Ryan Leung <[email protected]>

* schedule: fix a thread-safe bug and improve code (#1719)

* statistics: fix region flow calculation (#1688)

Signed-off-by: jiyingtk <[email protected]>

* makefile: improve deadlock-enable/disable (#1736)

* api: fix missing keys statistic in region information (#1741)

Signed-off-by: nolouch <[email protected]>

* *: update go version to 1.13 (#1742)

Signed-off-by: disksing <[email protected]>

* coordinator: add the operator cost time in log field (#1748)

Signed-off-by: nolouch <[email protected]>
@lhy1024 lhy1024 mentioned this pull request Nov 5, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rleungx rleungx rleungx approved these changes

@lhy1024 lhy1024 lhy1024 approved these changes

@shafreeck shafreeck Awaiting requested review from shafreeck

Assignees
No one assigned
Labels
status/can-merge Indicates a PR has been approved by a committer. type/bug The issue is confirmed as a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nolouch @codecov-io @sre-bot @lhy1024 @rleungx