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

ttl: fix ttl job manager will panic if the status cache doesn't contain table (#41069) #43552

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #41069

Signed-off-by: YangKeao [email protected]

What problem does this PR solve?

Issue Number: close #41067, close #41068

Problem Summary:

  1. The log of scan error doesn't contain error information.
  2. Job manager will panic if the status cache doesn't contain table.

What is changed and how it works?

  1. Replace the err with sqlErr
  2. Pass in the jobID directly. We could start this job anyway, as the job manager actually did little things, and can be processed by other managers in the future. Also, the tasks has been spawned, we'd better to keep the task locally.

I cannot reproduce the second situation in a natural way (except deleting the rows with concrete breakpoint). I'll add some tests about it after I understand how it occurs...

Could we try to restart the ttl job manager after it panics?

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 5, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • lcwangchao

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 release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels May 5, 2023
@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 5, 2023
@YangKeao YangKeao requested review from lcwangchao and hawkingrei May 5, 2023 07:51
@YangKeao
Copy link
Member

YangKeao commented May 5, 2023

It also picks some parts of #41069, to resolve the conflict.

@YangKeao YangKeao force-pushed the cherry-pick-41069-to-release-6.5 branch from 4d1ad09 to 14a78ac Compare May 5, 2023 08:18
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 5, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 5, 2023
Signed-off-by: Yang Keao <[email protected]>
@YangKeao YangKeao force-pushed the cherry-pick-41069-to-release-6.5 branch from 14a78ac to f0a55a1 Compare May 5, 2023 08:45
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 5, 2023

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

Commit hash: f0a55a1

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 5, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 5, 2023
@ti-chi-bot ti-chi-bot bot merged commit 5f32d79 into pingcap:release-6.5 May 5, 2023
lcwangchao pushed a commit to lcwangchao/tidb that referenced this pull request May 5, 2023
ti-chi-bot bot pushed a commit that referenced this pull request May 5, 2023
@ti-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 14, 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/cherry-pick-not-approved 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/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.

5 participants