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

service: Fix the issue that cannot update only TTL of the min service safepoint (#2633) #2635

Merged
merged 4 commits into from
Jul 14, 2020

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jul 14, 2020

cherry-pick #2633 to release-4.0


What problem does this PR solve?

Fixes #2628

Do not skip updating service safepoint when the requested safepoint equals to the minimum safepoint currently.

What is changed and how it works?

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch
    • release-4.0

Release note

  • Fixes the issue that sometimes service safepoint can't be set properly, which may make BR and dumpling fail.

…vice safepoint

Signed-off-by: MyonKeminta <mk@mkmkm.me>
@ti-srebot
Copy link
Contributor Author

@MyonKeminta please accept the invitation then you can push to the cherry-pick pull requests.
https://github.com/ti-srebot/pd/invitations

@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 Jul 14, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Jul 14, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 14, 2020
@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 Jul 14, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2627

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@lhy1024 lhy1024 added the type/bugfix This PR fixes a bug. label Jul 14, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Jul 14, 2020

/merge

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@codecov-commenter
Copy link

Codecov Report

Merging #2635 into release-4.0 will decrease coverage by 0.05%.
The diff coverage is 100.00%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release-4.0    #2635      +/-   ##
===============================================
- Coverage        77.11%   77.05%   -0.06%     
===============================================
  Files              205      205              
  Lines            22115    22115              
===============================================
- Hits             17053    17041      -12     
- Misses            3761     3769       +8     
- Partials          1301     1305       +4     
Impacted Files Coverage Δ
server/grpc_service.go 58.49% <100.00%> (-0.78%) ⬇️
server/schedulers/shuffle_hot_region.go 63.47% <0.00%> (-11.31%) ⬇️
server/schedulers/base_scheduler.go 60.86% <0.00%> (-8.70%) ⬇️
server/schedulers/random_merge.go 61.19% <0.00%> (-2.99%) ⬇️
server/tso/tso.go 78.51% <0.00%> (-2.97%) ⬇️
server/server.go 75.41% <0.00%> (-1.21%) ⬇️
server/schedulers/adjacent_region.go 75.53% <0.00%> (-1.07%) ⬇️
client/client.go 71.60% <0.00%> (-0.51%) ⬇️
server/handler.go 50.53% <0.00%> (-0.44%) ⬇️
... 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 52d88ad...732592a. Read the comment docs.

@lhy1024 lhy1024 added the require-LGT1 Indicates that the PR requires an LGTM. label Jul 14, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Jul 14, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2636

@ti-srebot
Copy link
Contributor Author

/run-all-tests

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/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 14, 2020
@lhy1024
Copy link
Contributor

lhy1024 commented Jul 14, 2020

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 2640

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 999331e into tikv:release-4.0 Jul 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
require-LGT1 Indicates that the PR requires an LGTM. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants