Skip to content

ttl: fix ttl txn will not return error when rolling back (#39918)#39921

Merged
ti-chi-bot merged 8 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-39918-to-release-6.5
Dec 20, 2022
Merged

ttl: fix ttl txn will not return error when rolling back (#39918)#39921
ti-chi-bot merged 8 commits intopingcap:release-6.5from
ti-chi-bot:cherry-pick-39918-to-release-6.5

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Dec 14, 2022

This is an automated cherry-pick of #39918

What problem does this PR solve?

Issue Number: close #39917

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Dec 14, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • YangKeao
  • hawkingrei

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.

Details

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/cherry-pick-not-approved labels Dec 14, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 14, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Dec 14, 2022
@YangKeao YangKeao mentioned this pull request Dec 16, 2022
Closed
60 tasks
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 19, 2022
@YangKeao YangKeao force-pushed the cherry-pick-39918-to-release-6.5 branch from df1f6d9 to 0f2645e Compare December 20, 2022 05:41
YangKeao
YangKeao approved these changes Dec 20, 2022
View reviewed changes
Copy link
Member

@YangKeao YangKeao left a comment

Choose a reason for hiding this comment

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

LGTM

YangKeao
YangKeao approved these changes Dec 20, 2022
View reviewed changes
Copy link
Member

@YangKeao YangKeao 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-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 20, 2022
@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 Dec 20, 2022
@hawkingrei
Copy link
Member

hawkingrei commented Dec 20, 2022

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Dec 20, 2022

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

DetailsCommit hash: 0f2645e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2022
@YangKeao
Copy link
Member

YangKeao commented Dec 20, 2022

/run-unit-test

@YangKeao
Copy link
Member

YangKeao commented Dec 20, 2022

/run-unit-test

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Dec 20, 2022

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

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.

@YangKeao
Copy link
Member

YangKeao commented Dec 20, 2022

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 9b70ed7 into pingcap:release-6.5 Dec 20, 2022
@ti-chi-bot ti-chi-bot deleted the cherry-pick-39918-to-release-6.5 branch April 15, 2025 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

@YangKeao YangKeao YangKeao approved these changes

Assignees

@lcwangchao lcwangchao

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @hawkingrei @YangKeao @lcwangchao @sre-bot