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

Owner: Fix gcttl bug (#1861) #1871

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #1861

What problem does this PR solve?

#1839

What is changed and how it works?

Modify the calculation method of MinGCSafePoint (the lower bound of CDC's gcSafePoint)

Before:
MinGCSafePoint = curentTs - gcTTL

After:
MinGCSafePoint = min(curentTs - gcTTL, pdSafePoint)

Check List

Tests

  • Unit test
  • Manual test (add detailed scripts or steps below)

Side effects

  • Increased code complexity

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Release note

  • owner: When tikv_gc_life_time is greater than gcttl, use tikv_gc_life_time to calculate the lower bound of gcSafePoint.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved status/ptal Could you please take a look? release-blocker This issue blocks a release. Please solve it ASAP. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR. labels May 29, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request May 29, 2021
@ti-chi-bot ti-chi-bot requested review from liuzix and lonng May 29, 2021 01:38
@lonng lonng added this to the v5.0.2 milestone May 30, 2021
@lonng lonng added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 30, 2021
@pingcap pingcap deleted a comment from CLAassistant May 30, 2021
@asddongmen asddongmen requested a review from amyangfei May 31, 2021 01:48
@asddongmen
Copy link
Contributor

/lgtm

@ti-chi-bot
Copy link
Member Author

@asddongmen: Thanks for your review. The bot only counts /lgtm from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

/lgtm

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.

@lonng lonng modified the milestones: v5.0.2, v4.0.14 May 31, 2021
@amyangfei amyangfei removed the release-blocker This issue blocks a release. Please solve it ASAP. label Jun 10, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 22, 2021
@zier-one
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

@leoppro: /merge in this pull request requires 2 approval(s).

In response to this:

/merge

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
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • leoppro
  • liuzix

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot 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 Jun 22, 2021
@asddongmen
Copy link
Contributor

/run-leak-tests

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: 012cb9a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 24, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #1871 (8c93f79) into release-4.0 (753073a) will decrease coverage by 0.1629%.
The diff coverage is 62.7033%.

@@                 Coverage Diff                 @@
##           release-4.0      #1871        +/-   ##
===================================================
- Coverage      53.7661%   53.6032%   -0.1630%     
===================================================
  Files              153        163        +10     
  Lines            15958      17290      +1332     
===================================================
+ Hits              8580       9268       +688     
- Misses            6475       7042       +567     
- Partials           903        980        +77     

@ti-chi-bot ti-chi-bot merged commit 059b7c7 into pingcap:release-4.0 Jun 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/ptal Could you please take a look? type/cherry-pick-for-release-4.0 This PR is cherry-picked to release-4.0 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants