Skip to content

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

Merged
ti-chi-bot merged 2 commits into
pingcap:masterfrom
MyonKeminta:m/fix-on-stmt-end
Jul 9, 2021
Merged

session: Fix txn.onStmtEnd is not called when some special error occurs in ExecutePreparedStmt#26056
ti-chi-bot merged 2 commits into
pingcap:masterfrom
MyonKeminta:m/fix-on-stmt-end

Conversation

@MyonKeminta
Copy link
Copy Markdown
Contributor

@MyonKeminta MyonKeminta commented Jul 8, 2021

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.

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 8, 2021
@github-actions github-actions Bot added the sig/sql-infra SIG: SQL Infra label Jul 8, 2021
cfzjywxk
cfzjywxk reviewed Jul 8, 2021
View reviewed changes
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
@cfzjywxk
Copy link
Copy Markdown
Contributor

cfzjywxk commented Jul 9, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 9, 2021

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

Details

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.

cfzjywxk
cfzjywxk approved these changes Jul 9, 2021
View reviewed changes
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
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 9, 2021

[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 9, 2021
@cfzjywxk
Copy link
Copy Markdown
Contributor

cfzjywxk commented Jul 9, 2021

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 9, 2021

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

DetailsCommit hash: 8159237

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 9, 2021
@ti-chi-bot ti-chi-bot merged commit 7670912 into pingcap:master Jul 9, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 9, 2021
@MyonKeminta @ti-srebot
cherry pick pingcap#26056 to release-5.1
3c1eaed 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 9, 2021
Merged
@ti-srebot
Copy link
Copy Markdown
Contributor

ti-srebot commented Jul 9, 2021

cherry pick to release-5.1 in PR #26080

@MyonKeminta MyonKeminta deleted the m/fix-on-stmt-end branch July 9, 2021 06:03
ti-chi-bot pushed a commit that referenced this pull request Jul 19, 2021
@ti-srebot
session: Fix txn.onStmtEnd is not called when some special error occu…
a823398 
…rs in ExecutePreparedStmt (#26056) (#26080)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cfzjywxk cfzjywxk cfzjywxk approved these changes

+1 more reviewer

@longfangsong longfangsong longfangsong approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

needs-cherry-pick-release-5.1 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@MyonKeminta @cfzjywxk @ti-chi-bot @ti-srebot @longfangsong