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

*: fix panic when reusing OptimisticTxnContextProvider #38952

Merged
merged 1 commit into from
Nov 7, 2022

Conversation

lcwangchao
Copy link
Collaborator

@lcwangchao lcwangchao commented Nov 7, 2022

What problem does this PR solve?

Issue Number: close #38951

Problem Summary:

To reduce space allocation, we used to reserve OptimisticTxnContextProvider to txnManager that cause the old and new OptimisticTxnContextProvider be the same. After ResetForNewTxn , the old provider's state will be corrputed.

It is triggered when new MDL codes merged, see: #38926 (comment)

What is changed and how it works?

Reserve two OptimisticTxnContextProvider and make the old and the new one not the same.

Check List

  • No code

Release note

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 7, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • xhebox

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 release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 7, 2022
@lcwangchao
Copy link
Collaborator Author

/check-issue-triage-complete

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d45eacc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 7, 2022
@ti-chi-bot ti-chi-bot merged commit 32248e2 into pingcap:master Nov 7, 2022
@lcwangchao lcwangchao deleted the fix_resuse_opt_provider branch November 7, 2022 15:15
@sre-bot
Copy link
Contributor

sre-bot commented Nov 7, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🟥 failed 1, success 10, total 11 9 min 9 sec New failing
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 3, success 3, total 6 43 min Existing failure
idc-jenkins-ci/integration-cdc-test 🔴 failed 1, success 38, total 39 18 min Existing failure
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 10 min Existing failure
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 13 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 20 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 19 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 49 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 29 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

unstable test TestBatchInsertWithOnDuplicate
5 participants