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

session: make TxnInfo() return even if process info is empty (#57044) #57162

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #57044

What problem does this PR solve?

Issue Number: close #57043

Problem Summary:

tidb/pkg/session/session.go

Lines 4026 to 4030 in c240fdf

txnInfo := tmp.TxnInfo()
if txnInfo != nil {
startTS = txnInfo.StartTS
processInfoID = txnInfo.ConnectionID
}

TxnInfo() could be nil if process info is not set(see the implementation of TxnInfo()). Such sessions are commonly used in DDL/DXF:

sessCtx, err := w.sessPool.Get()
if err != nil {
logutil.Logger(w.ctx).Error("tableScanWorker get session from pool failed", zap.Error(err))
w.ctx.onError(err)
return
}
w.se = session.NewSession(sessCtx)

And they only invoke session.Begin() before using:

func wrapInBeginRollback(se *sess.Session, f func(startTS uint64) error) error {
err := se.Begin(context.Background())
if err != nil {
return errors.Trace(err)
}
defer se.Rollback()

As a result, the startTS from internal DDL sessions will not be reported to etcd, and GC safepoint will be advanced unexpectedly.

What changed and how does it work?

Make TxnInfo() return even if process info is empty.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Nov 6, 2024
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. cherry-pick-approved Cherry pick PR approved by release team. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved labels Nov 6, 2024
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 11, 2024
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Nov 11, 2024
@ti-chi-bot ti-chi-bot bot added the lgtm label Nov 11, 2024
Copy link

ti-chi-bot bot commented Nov 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, tangenta

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 11, 2024
Copy link

ti-chi-bot bot commented Nov 11, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-11-11 06:27:14.561469675 +0000 UTC m=+251196.752338672: ☑️ agreed by tangenta.
  • 2024-11-11 06:59:37.074937042 +0000 UTC m=+253139.265806038: ☑️ agreed by D3Hunter.

@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Nov 12, 2024
@ti-chi-bot ti-chi-bot bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 12, 2024
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Nov 12, 2024
Copy link

codecov bot commented Nov 12, 2024

Codecov Report

Attention: Patch coverage is 87.50000% with 5 lines in your changes missing coverage. Please review.

Please upload report for BASE (release-7.1@cc699b6). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.1     #57162   +/-   ##
================================================
  Coverage               ?   73.4590%           
================================================
  Files                  ?       1213           
  Lines                  ?     382066           
  Branches               ?          0           
================================================
  Hits                   ?     280662           
  Misses                 ?      83476           
  Partials               ?      17928           

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Nov 12, 2024
@ti-chi-bot ti-chi-bot bot merged commit 4ecd2b8 into pingcap:release-7.1 Nov 12, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants