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: cancel the hearbeat timeout job after disable the TTL #57452

Merged
merged 1 commit into from
Nov 18, 2024

Conversation

YangKeao
Copy link
Member

What problem does this PR solve?

Issue Number: close #57404

Problem Summary:

If a job's hearbeat timeout, it cannot be cancelled after disabling the TTL job.

What changed and how does it work?

Move the logic of locking the heartbeat timeout job above the logic of cancelling jobs.

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.

Release note

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

None

@ti-chi-bot ti-chi-bot bot added 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. labels Nov 18, 2024
Copy link

codecov bot commented Nov 18, 2024

Codecov Report

Attention: Patch coverage is 62.50000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 73.6332%. Comparing base (3232160) to head (751be0e).
Report is 13 commits behind head on master.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #57452        +/-   ##
================================================
+ Coverage   72.8400%   73.6332%   +0.7931%     
================================================
  Files          1672       1672                
  Lines        462663     463796      +1133     
================================================
+ Hits         337004     341508      +4504     
+ Misses       104862     101525      -3337     
+ Partials      20797      20763        -34     
Flag Coverage Δ
integration 43.6406% <37.5000%> (?)
unit 72.4624% <62.5000%> (+0.2389%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.7673% <ø> (ø)
parser ∅ <ø> (∅)
br 45.1379% <ø> (+0.0153%) ⬆️
---- 🚨 Try these New Features:

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 18, 2024
Copy link

ti-chi-bot bot commented Nov 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Defined2014, lcwangchao

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:
  • OWNERS [Defined2014,lcwangchao]

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 added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Nov 18, 2024
Copy link

ti-chi-bot bot commented Nov 18, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-11-18 06:55:29.246731038 +0000 UTC m=+857691.437600028: ☑️ agreed by lcwangchao.
  • 2024-11-18 07:05:38.388561456 +0000 UTC m=+858300.579430446: ☑️ agreed by Defined2014.

@YangKeao
Copy link
Member Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit afe8a09 into pingcap:master Nov 18, 2024
24 checks passed
@YangKeao YangKeao added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. labels Nov 19, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #57488.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 19, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #57489.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 19, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.5: #57490.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #57491.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 19, 2024
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 19, 2024
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #57492.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TTL Job keeps running if the TTL is disabled after losing heartbeat
4 participants