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: fix a bug that MDL may progress unexpectedly or block forever (#46921) #47068

Merged

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Sep 18, 2023

This is an automated cherry-pick of #46921

Note: this PR is the cherry-pick of https://github.com/pingcap/tidb/pull/47079, it fixes some bugs on 6.5 branch

What problem does this PR solve?

Issue Number: close #46920 and close #46751

Problem Summary:

What is changed and how it works?

  1. Check once for every DDL job.
  2. Check if waitSchemaChange is returned correctly.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    Pass the test described in the issue
  • No code

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.

fix a bug that MDL may progress unexpectedly or block forever

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Sep 18, 2023
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 18, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Sep 18, 2023

This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 18, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 21, 2023
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 the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Nov 22, 2023
@Benjamin2037
Copy link
Collaborator

/retest

@wjhuang2016 wjhuang2016 force-pushed the cherry-pick-46921-to-release-6.5 branch from ff7e3a8 to a948ec8 Compare November 23, 2023 09:30
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Nov 23, 2023
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Nov 23, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 23, 2023
Copy link

ti-chi-bot bot commented Nov 23, 2023

[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 approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 23, 2023
Copy link

ti-chi-bot bot commented Nov 23, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-22 03:50:51.857532999 +0000 UTC m=+376280.522759195: ☑️ agreed by Benjamin2037.
  • 2023-11-23 09:56:53.753584698 +0000 UTC m=+484642.418810899: ☑️ agreed by zimulala.

@wjhuang2016
Copy link
Member

/retest

3 similar comments
@wjhuang2016
Copy link
Member

/retest

@wjhuang2016
Copy link
Member

/retest

@wjhuang2016
Copy link
Member

/retest

Copy link

codecov bot commented Nov 24, 2023

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #47068   +/-   ##
================================================
  Coverage               ?   74.0414%           
================================================
  Files                  ?       1087           
  Lines                  ?     352836           
  Branches               ?          0           
================================================
  Hits                   ?     261245           
  Misses                 ?      75071           
  Partials               ?      16520           

@wjhuang2016
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit bec245b into pingcap:release-6.5 Nov 27, 2023
10 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 Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants