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

scheduler: fix the issue that some scheduler persist config without solving error (#2817) #2818

Merged
merged 2 commits into from
Sep 1, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #2817 to release-4.0


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

What problem does this PR solve?

fix the issue that some scheduler persist config without solving error

What is changed and how it works?

return with error

Check List

Tests

  • Unit test

Release note

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

@rleungx rleungx 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/LGT2 Indicates that a PR has LGTM 2. labels Aug 21, 2020
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/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Aug 21, 2020
@codecov
Copy link

codecov bot commented Aug 21, 2020

Codecov Report

Merging #2818 into release-4.0 will increase coverage by 0.31%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2818      +/-   ##
===============================================
+ Coverage        77.56%   77.87%   +0.31%     
===============================================
  Files              208      208              
  Lines            22768    22765       -3     
===============================================
+ Hits             17660    17729      +69     
+ Misses            3792     3708      -84     
- Partials          1316     1328      +12     
Impacted Files Coverage Δ
server/schedulers/evict_leader.go 72.24% <100.00%> (-0.14%) ⬇️
server/schedulers/grant_leader.go 71.66% <100.00%> (-0.16%) ⬇️
server/schedulers/scatter_range.go 83.01% <100.00%> (-0.11%) ⬇️
pkg/etcdutil/etcdutil.go 86.95% <0.00%> (-4.35%) ⬇️
server/kv/etcd_kv.go 84.41% <0.00%> (-3.90%) ⬇️
server/tso/tso.go 82.27% <0.00%> (-3.80%) ⬇️
server/cluster/coordinator.go 70.74% <0.00%> (-1.20%) ⬇️
server/server.go 76.82% <0.00%> (-1.19%) ⬇️
pkg/btree/btree.go 86.84% <0.00%> (-0.81%) ⬇️
server/member/leader.go 74.70% <0.00%> (-0.78%) ⬇️
... and 7 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 57f6db1...9203749. Read the comment docs.

@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 Aug 21, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

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

Your auto merge job has been accepted, waiting for:

  • 2871
  • 2871

@lhy1024
Copy link
Contributor

lhy1024 commented Sep 1, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2871
  • 2871

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 928c257 into tikv:release-4.0 Sep 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/scheduler Scheduler logic. status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants