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

br/streamhelper: fix panic while removing task (#50869) #51053

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #50869

What problem does this PR solve?

Issue Number: close #50839

Problem Summary:

What changed and how does it work?

This PR will do the nil check over the checkpoints.
This PR also will catch the panic generated during the subscription handler.
And some locking are acquired during handling incoming tasks.

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.

Fixed a bug that may make TiDB panic when stopping a log backup task.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot added ok-to-test Indicates a PR is ready to be tested. 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. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Feb 7, 2024
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 7, 2024
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 7, 2024
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 7, 2024
Signed-off-by: Yu Juncen <yu745514916@live.com>
@ti-chi-bot ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 7, 2024
Copy link

codecov bot commented Feb 7, 2024

Codecov Report

❗ No coverage uploaded for pull request base (release-7.5@d686efd). Click here to learn what that means.
The diff coverage is 79.4117%.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #51053   +/-   ##
================================================
  Coverage               ?   71.9876%           
================================================
  Files                  ?       1403           
  Lines                  ?     407363           
  Branches               ?          0           
================================================
  Hits                   ?     293251           
  Misses                 ?      94385           
  Partials               ?      19727           
Flag Coverage Δ
unit 71.9876% <79.4117%> (?)

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

Components Coverage Δ
dumpling 53.9913% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.2990% <0.0000%> (?)

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

ti-chi-bot bot commented Feb 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BornChanger, YuJuncen

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:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link

ti-chi-bot bot commented Feb 18, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-02-07 09:56:32.436356402 +0000 UTC m=+350718.003126279: ☑️ agreed by YuJuncen.
  • 2024-02-18 02:56:27.576142521 +0000 UTC m=+153076.323765631: ☑️ agreed by BornChanger.

@hawkingrei
Copy link
Member

/retest


go func() {
defer utils.CatchAndLogPanic()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it catch the panic here. but this goroutine has no longer exists anymore.
do we need generate this for loop again?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a random panic happens, the caller may or may not require retry this loop. I think it will be better to don't regenerate this loop and make the caller to decide whether to spawn another loop.

Perhaps we can add some mark about whether the goroutine is still running later. Anyhow that is out of this PR's scope, which focus on restricting the panic in the scope of log backup advancer.

Copy link
Contributor

@3pointer 3pointer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest LGTM

@YuJuncen
Copy link
Contributor

/retest-required

@BornChanger
Copy link
Contributor

/retest

@ti-chi-bot ti-chi-bot bot merged commit bf23a3f into pingcap:release-7.5 Feb 19, 2024
20 of 21 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm ok-to-test Indicates a PR is ready to be tested. 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. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants