Skip to content

session: Fix txn.onStmtEnd is not called when some special error occurs in ExecutePreparedStmt (#26056)#26080

Merged
ti-chi-bot merged 2 commits into
pingcap:release-5.1from
ti-srebot:release-5.1-7670912948f0
Jul 19, 2021
Merged

session: Fix txn.onStmtEnd is not called when some special error occurs in ExecutePreparedStmt (#26056)#26080
ti-chi-bot merged 2 commits into
pingcap:release-5.1from
ti-srebot:release-5.1-7670912948f0

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Jul 9, 2021

cherry-pick #26056 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/26080

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/26080:release-5.1-7670912948f0

What problem does this PR solve?

Problem Summary:

In this part of code, previously it calls onStmtStart, calculates the result, calls onStmtEnd, and return the result. However later some modification to this code adds some more return statements between the onStmtStart and onStmtEnd calls, which makes the onStmtEnd not called in some rare cases. This PR fixes it by calling onStmtEnd in defer statement.

What is changed and how it works?

What's Changed: Call the onStmtEnd in defer stmt.

Related changes

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

Check List

Tests

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note

  • No release note.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Copy Markdown
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Copy Markdown
Contributor Author

@MyonKeminta you're already a collaborator in bot's repo.

Copy link
Copy Markdown
Contributor

@cfzjywxk cfzjywxk 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 Jul 9, 2021
@ti-chi-bot
Copy link
Copy Markdown
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • longfangsong

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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jul 15, 2021
@zhouqiang-cl
Copy link
Copy Markdown
Contributor

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

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

DetailsCommit hash: 3c1eaed

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 19, 2021
@ti-chi-bot
Copy link
Copy Markdown
Member

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

At the same time I will also trigger all tests for you:

/run-all-tests

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.

@ti-chi-bot ti-chi-bot merged commit a823398 into pingcap:release-5.1 Jul 19, 2021
@zhouqiang-cl zhouqiang-cl added this to the v5.1.1 milestone Jul 26, 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. sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction size/XS Denotes a PR that changes 0-9 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/5.1-cherry-pick

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants