Skip to content

br: fix compatibility issue with concurrent ddl (#36474)#36489

Merged
ti-chi-bot merged 3 commits into
pingcap:release-6.2from
ti-srebot:release-6.2-28a8ffcf67f9
Jul 25, 2022
Merged

br: fix compatibility issue with concurrent ddl (#36474)#36489
ti-chi-bot merged 3 commits into
pingcap:release-6.2from
ti-srebot:release-6.2-28a8ffcf67f9

Conversation

@ti-srebot
Copy link
Copy Markdown
Contributor

@ti-srebot ti-srebot commented Jul 23, 2022 •
edited
Loading

cherry-pick #36474 to release-6.2
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/36489

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/36489:release-6.2-28a8ffcf67f9

What problem does this PR solve?

Issue Number: close #36453

Problem Summary:
After concurrent DDL feature implemented. v6.2 cluster will use a new way(ddl table) to execute ddls. but when using v6.2 br to restore cluster to v6.1 doesn't have such ddl tables.

What is changed and how it works?

This PR add a check. when using br (> v6.2) restore cluster (< v6.1). br will disable the switch of concurrent ddl.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

截屏2022-07-22 下午4 07 08

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

None

@3pointer @ti-srebot
cherry pick pingcap#36474 to release-6.2
cfa23a6 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 23, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • D3Hunter
  • xiongjiwei

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-srebot
Copy link
Copy Markdown
Contributor Author

ti-srebot commented Jul 23, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 23, 2022
@ti-srebot ti-srebot mentioned this pull request Jul 23, 2022
Merged
12 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/6.2-cherry-pick labels Jul 23, 2022
@ti-srebot
Copy link
Copy Markdown
Contributor Author

ti-srebot commented Jul 23, 2022

@3pointer you're already a collaborator in bot's repo.

@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Jul 23, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/4fe3086b3da87187c30537e085c2ba08737cfa50

@3pointer
Copy link
Copy Markdown
Contributor

3pointer commented Jul 25, 2022

/run-integration-br-tests

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 25, 2022
@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 25, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jul 25, 2022
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 25, 2022
@3pointer
Copy link
Copy Markdown
Contributor

3pointer commented Jul 25, 2022

/merge

@ti-chi-bot
Copy link
Copy Markdown
Member

ti-chi-bot commented Jul 25, 2022

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

DetailsCommit hash: 4fe3086

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 25, 2022
@ti-chi-bot ti-chi-bot merged commit 2fde17e into pingcap:release-6.2 Jul 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@D3Hunter D3Hunter D3Hunter approved these changes

@wjhuang2016 wjhuang2016 wjhuang2016 approved these changes

+1 more reviewer

@xiongjiwei xiongjiwei xiongjiwei approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@3pointer 3pointer

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 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. type/6.2-cherry-pick

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@ti-srebot @ti-chi-bot @sre-bot @3pointer @D3Hunter @wjhuang2016 @xiongjiwei @VelocityLight