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: maintain task meta in singleTaskMetaMgr (#34214) #34226

Merged
merged 4 commits into from
Apr 26, 2022
Merged

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

merged 4 commits into from
Apr 26, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 26, 2022 •
edited
Loading

cherry-pick #34214 to release-5.4
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/34226

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

git push git@github.com:ti-srebot/tidb.git pr/34226:release-5.4-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.

tidb/br/pkg/lightning/restore/meta_manager.go

Line 1088 in 9fc73ac

return true, nil

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

tidb/br/pkg/lightning/restore/restore.go

Line 1923 in 9fc73ac

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.

@sleepymole @ti-srebot
cherry pick pingcap#34214 to release-5.4
8893272 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 26, 2022 •
edited
Loading

[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 mentioned this pull request Apr 26, 2022
Merged
4 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.4-cherry-pick labels Apr 26, 2022
@ti-srebot ti-srebot added this to the v5.4.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 •
edited
Loading

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

@sleepymole
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: a64957b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 26, 2022
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 26, 2022
@sleepymole
Copy link
Contributor

/run-unit-test

@sleepymole
Copy link
Contributor

/run-mysql-test

@sleepymole
Copy link
Contributor

/run-all-tests

@sleepymole
Copy link
Contributor

/run-mysql-test

@sleepymole
Copy link
Contributor

/run-mysql-test

@niubell
Copy link
Contributor

niubell commented Apr 26, 2022

/run-unit-test

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@ti-chi-bot
Copy link
Member

@buchuitoudegou: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

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 ti-community-infra/tichi repository.

@sleepymole
Copy link
Contributor

/run-mysql-test

3 similar comments
@sleepymole
Copy link
Contributor

/run-mysql-test

@sleepymole
Copy link
Contributor

/run-mysql-test

@sleepymole
Copy link
Contributor

/run-mysql-test

@ti-chi-bot ti-chi-bot merged commit 80a89fc into pingcap:release-5.4 Apr 26, 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

@sleepymole sleepymole sleepymole approved these changes

@buchuitoudegou buchuitoudegou buchuitoudegou approved these changes

@glorv glorv Awaiting requested review from glorv

Assignees

@sleepymole sleepymole

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.4-cherry-pick
Projects
None yet
Milestone
v5.4.1
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @sre-bot @sleepymole @niubell @D3Hunter @buchuitoudegou @zhouqiang-cl