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.

Sign up for GitHub

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

Jump to bottom

lightning: add back table empty check and add a switch config (#30887) #30926

Merged
merged 19 commits into from
Feb 22, 2022
Merged

lightning: add back table empty check and add a switch config (#30887) #30926

merged 19 commits into from
Feb 22, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 22, 2021 •
edited
Loading

cherry-pick #30887 to release-5.3
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/30926

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

git push git@github.com:ti-srebot/tidb.git pr/30926:release-5.3-393415782452

What problem does this PR solve?

Issue Number: close #27919

Problem Summary:

What is changed and how it works?

  • Add a new config tikv-importer.incremental-import to control whether allow lightning to import to table that already contains data
  • When tikv-importer.incremental-import = false, tidb-lightning will check target tables' vacancy. If the tables already contains data, lightning will directly report an error and exit. In this mode, lightning will also avoid create and write data into lightning_meta in target tidb.

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility
    • Add a new config to control the table empty check, so this is not compatible with v5.2 and v5.3.

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Add a new config to control whether support incremental import.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 22, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • glorv
  • lichunzhu

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.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved 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 Dec 22, 2021
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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 Dec 22, 2021
@ti-srebot ti-srebot added component/lightning This issue is related to Lightning of TiDB. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/5.3-cherry-pick type/bugfix This PR fixes a bug. labels Dec 22, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 22, 2021
Merged
12 tasks
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 22, 2021
@glorv
Copy link
Contributor

glorv commented Dec 22, 2021

depend on #30888

@kennytm
Copy link
Contributor

kennytm commented Dec 22, 2021

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 22, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 15, 2022
@lichunzhu
Copy link
Contributor

@glorv #30888 has been merged. Could you please help resolve the conflicts of this PR?

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 18, 2022
@kennytm
Copy link
Contributor

kennytm commented Feb 18, 2022

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 18, 2022
@glorv glorv force-pushed the release-5.3-393415782452 branch from dd2194d to cc839fe Compare February 21, 2022 03:51
@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/run-all-tests

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

1 similar comment
@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

1 similar comment
@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/run-check_dev

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/run-mysql-test

@kennytm
Copy link
Contributor

kennytm commented Feb 22, 2022

/run-check_dev

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/merge

@glorv
Copy link
Contributor

glorv commented Feb 22, 2022

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit f3752c3 into pingcap:release-5.3 Feb 22, 2022
@glorv glorv deleted the release-5.3-393415782452 branch February 23, 2022 02:23
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
@glorv glorv mentioned this pull request Feb 24, 2022
Merged
16 tasks
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 24, 2022
Merged
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lichunzhu lichunzhu lichunzhu approved these changes

@glorv glorv glorv approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

@sleepymole sleepymole Awaiting requested review from sleepymole

@kennytm kennytm Awaiting requested review from kennytm

@Little-Wallace Little-Wallace Awaiting requested review from Little-Wallace

Assignees

@glorv glorv

Labels
cherry-pick-approved Cherry pick PR approved by release team. component/lightning This issue is related to Lightning of TiDB. 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. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/5.3-cherry-pick
Projects
None yet
Milestone
v5.3.1
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-srebot @ti-chi-bot @glorv @kennytm @lichunzhu @purelind @zhouqiang-cl