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

lightning: maintain task meta in singleTaskMetaMgr (#34214) #34225

Merged
merged 2 commits into from
May 23, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 26, 2022

cherry-pick #34214 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/34225

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

git push git@github.com:ti-srebot/tidb.git pr/34225:release-5.3-59566fad343c

What problem does this PR solve?

Issue Number: close #34213

Problem Summary:

Lightning precheck doesn't check local disk resources and cluster available.

What is changed and how it works?

When incremental-import is set to false, Lightning doesn't create a metadata schema in downstream TiDB. Instead, it creates a singleTaskMetaMgr to maintain task metadata. However, singleTaskMetaMgr always returns true for task existence check.

Precheck for local disk resources and cluster available are accidentally skipped. Because lightning thinks the check has been performed before.

taskExist, err = rc.taskMgr.CheckTaskExist(ctx)

Check List

Tests

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

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fix the issue that Lightning precheck doesn't check local disk resources and cluster available.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 26, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • D3Hunter
  • gozssky

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 Apr 26, 2022
@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 Apr 26, 2022
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.3-cherry-pick labels Apr 26, 2022
@ti-srebot ti-srebot added this to the v5.3.1 milestone Apr 26, 2022
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 26, 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 Apr 26, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 26, 2022

@sleepymole
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 2b63ba6

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 26, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 23, 2022
@ti-chi-bot ti-chi-bot merged commit 1ebb154 into pingcap:release-5.3 May 23, 2022
@sleepymole sleepymole deleted the release-5.3-59566fad343c branch May 23, 2022 06:24
@heibaijian heibaijian modified the milestones: v5.3.1, v5.3.2 Jun 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. 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. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/5.3-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants