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

*: support rollback from higher version to 6.5 #45762

Merged
merged 4 commits into from
Aug 7, 2023

Conversation

wjhuang2016
Copy link
Member

@wjhuang2016 wjhuang2016 commented Aug 2, 2023

What problem does this PR solve?

Issue Number: close #45570

Problem Summary:
We checked DDLTableVersion == 2 in 6.5, but it may be set to a higher value in a higher version TiDB.

What is changed and how it works?

check DDLTableVersion >= 2, which is the same as the fixed in the higher version.

Check List

Tests

  • Unit test

  • Integration test

  • Manual test (add detailed scripts or steps below)
    Start a master cluster, then use this PR to start a TiDB server. It can start normally.

  • 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.

 support rollback from higher version to 6.5

Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 2, 2023
@wjhuang2016
Copy link
Member Author

/retest

@Benjamin2037
Copy link
Collaborator

Please add UT cover change.

Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 2, 2023
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
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 Aug 2, 2023
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Aug 3, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Aug 3, 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
Copy link

ti-chi-bot bot commented Aug 3, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-08-02 09:47:23.765532608 +0000 UTC m=+265127.707881139: ☑️ agreed by Benjamin2037.
  • 2023-08-03 02:37:35.63594041 +0000 UTC m=+325739.578288944: ☑️ agreed by zimulala.

@ti-chi-bot ti-chi-bot bot added the approved label Aug 3, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Aug 3, 2023
@wjhuang2016
Copy link
Member Author

/retest

Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@codecov
Copy link

codecov bot commented Aug 7, 2023

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #45762   +/-   ##
================================================
  Coverage               ?   73.6919%           
================================================
  Files                  ?       1083           
  Lines                  ?     347205           
  Branches               ?          0           
================================================
  Hits                   ?     255862           
  Misses                 ?      74937           
  Partials               ?      16406           

@ti-chi-bot ti-chi-bot bot merged commit 69ba144 into pingcap:release-6.5 Aug 7, 2023
3 checks passed
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Nov 28, 2023
Copy link

ti-chi-bot bot commented Nov 28, 2023

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

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved do-not-merge/cherry-pick-not-approved lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants