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

br: check the correct changefeed info when restore/import data (#47322) #47369

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #47322

What problem does this PR solve?

Issue Number: close pingcap/tiflow#9807

Problem Summary:

  1. cdc will generate __backup__ changefeed key after upgrade from v6.1. and the check cannot handle it right now.

What is changed and how it works?

  1. make check-requirements can skip the cdc change feed check.
  2. fix the issue that br can handle migration key in etcd after cdc upgrade from v6.1.

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.

fix the issue that br can handle migration key in etcd after cdc upgrade from v6.1.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 28, 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 28, 2023
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. skip-issue-check Indicates that a PR no need to check linked issue. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Sep 28, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Sep 28, 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 28, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 30, 2023
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Nov 20, 2023
@ti-chi-bot ti-chi-bot bot added the lgtm label Nov 20, 2023
Copy link

ti-chi-bot bot commented Nov 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3pointer, Leavrth

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 20, 2023
Copy link

ti-chi-bot bot commented Nov 20, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-11-20 08:07:01.242726972 +0000 UTC m=+218849.907953166: ☑️ agreed by 3pointer.
  • 2023-11-20 08:08:16.421815139 +0000 UTC m=+218925.087041333: ☑️ agreed by Leavrth.

Copy link

codecov bot commented Nov 22, 2023

Codecov Report

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

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #47369   +/-   ##
================================================
  Coverage               ?   73.6460%           
================================================
  Files                  ?       1086           
  Lines                  ?     349113           
  Branches               ?          0           
================================================
  Hits                   ?     257108           
  Misses                 ?      75529           
  Partials               ?      16476           

@ti-chi-bot ti-chi-bot bot merged commit 4d64ba0 into pingcap:release-6.5 Nov 22, 2023
13 checks passed
3pointer added a commit to 3pointer/tidb that referenced this pull request Jan 13, 2024
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 ok-to-test Indicates a PR is ready to be tested. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. skip-issue-check Indicates that a PR no need to check linked issue. 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.

3 participants