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

ddl: do not unset involving schema on EntryTooLarge error (#51963) #51967

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #51963

What problem does this PR solve?

Issue Number: close #51962

Problem Summary:

tidb/pkg/ddl/ddl_worker.go

Lines 544 to 565 in 274d5e2

func (w *worker) handleUpdateJobError(t *meta.Meta, job *model.Job, err error) error {
if err == nil {
return nil
}
if kv.ErrEntryTooLarge.Equal(err) {
w.jobLogger(job).Warn("update DDL job failed", zap.String("job", job.String()), zap.Error(err))
w.sess.Rollback()
err1 := w.sess.Begin()
if err1 != nil {
return errors.Trace(err1)
}
// Reduce this txn entry size.
job.BinlogInfo.Clean()
job.InvolvingSchemaInfo = nil
job.Error = toTError(err)
job.ErrorCount++
job.SchemaState = model.StateNone
job.State = model.JobStateCancelled
err = w.finishDDLJob(t, job)
}
return errors.Trace(err)
}

We should not set job.InvolvingSchemaInfo to nil even if this txn size is too large, because we need this field to "unblock" other DDLs that change the same schemas/tables.

What changed and how does it work?

See 'Files Changed'.

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

@ti-chi-bot ti-chi-bot added 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. type/cherry-pick-for-release-8.0 labels Mar 21, 2024
Copy link
Collaborator

@Benjamin2037 Benjamin2037 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 bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 21, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 21, 2024
Copy link

ti-chi-bot bot commented Mar 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, zimulala

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 added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Mar 21, 2024
Copy link

ti-chi-bot bot commented Mar 21, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-03-21 04:59:56.791835324 +0000 UTC m=+1525623.814081713: ☑️ agreed by Benjamin2037.
  • 2024-03-21 06:42:44.128456864 +0000 UTC m=+1531791.150703251: ☑️ agreed by zimulala.

@tangenta
Copy link
Contributor

/retest

Copy link

codecov bot commented Mar 21, 2024

Codecov Report

❗ No coverage uploaded for pull request base (release-8.0@bca83e6). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.0     #51967   +/-   ##
================================================
  Coverage               ?   70.7735%           
================================================
  Files                  ?       1477           
  Lines                  ?     439406           
  Branches               ?          0           
================================================
  Hits                   ?     310983           
  Misses                 ?     108945           
  Partials               ?      19478           
Flag Coverage Δ
unit 70.5143% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9957% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 46.1364% <0.0000%> (?)

@ti-chi-bot ti-chi-bot bot merged commit 83828be into pingcap:release-8.0 Mar 21, 2024
18 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/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-8.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants