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: fix backoffer can't handle multierrs #54084

Merged
merged 4 commits into from
Jun 19, 2024
Merged

Conversation

RidRisR
Copy link
Contributor

@RidRisR RidRisR commented Jun 18, 2024

What problem does this PR solve?

Issue Number: close #54053

Problem Summary:

Backoffer can't recognize multierrs, therefore it would stop retry for recursive retry calling

What changed and how does it work?

Enable backoffer to recognize the multierr, and it will only check the last err returned

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.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

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 Jun 18, 2024
Copy link

tiprow bot commented Jun 18, 2024

Hi @RidRisR. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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-sigs/prow repository.

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

/hold

@ti-chi-bot ti-chi-bot bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/needs-triage-completed labels Jun 18, 2024
@BornChanger BornChanger changed the base branch from master to release-6.5 June 18, 2024 06:54
@BornChanger BornChanger requested a review from a team as a code owner June 18, 2024 06:54
@BornChanger BornChanger changed the base branch from release-6.5 to master June 18, 2024 06:55
@ti-chi-bot ti-chi-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 18, 2024
@BornChanger BornChanger removed the request for review from a team June 18, 2024 06:55
Copy link

codecov bot commented Jun 18, 2024

Codecov Report

Attention: Patch coverage is 80.00000% with 1 line in your changes missing coverage. Please review.

Project coverage is 55.9839%. Comparing base (9008d23) to head (79ca74a).
Report is 9 commits behind head on master.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #54084         +/-   ##
=================================================
- Coverage   72.8351%   55.9839%   -16.8512%     
=================================================
  Files          1516       1636        +120     
  Lines        434738     608081     +173343     
=================================================
+ Hits         316642     340428      +23786     
- Misses        98508     244018     +145510     
- Partials      19588      23635       +4047     
Flag Coverage Δ
integration 22.9500% <80.0000%> (?)

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

Components Coverage Δ
dumpling 52.9656% <ø> (ø)
parser ∅ <ø> (∅)
br 62.8620% <80.0000%> (+16.7360%) ⬆️

@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Jun 18, 2024
@ti-chi-bot ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. sig/planner SIG: Planner and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. approved labels Jun 18, 2024
@Leavrth Leavrth added the needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. label Jun 18, 2024
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Jun 18, 2024
@Leavrth Leavrth removed the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Jun 19, 2024
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Jun 19, 2024
Copy link
Contributor

@YuJuncen YuJuncen 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

br/pkg/restore/log_client/import_retry_test.go Outdated Show resolved Hide resolved
Co-authored-by: 山岚 <36239017+YuJuncen@users.noreply.github.com>
@RidRisR RidRisR requested a review from YuJuncen June 19, 2024 06:11
Copy link

ti-chi-bot bot commented Jun 19, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Leavrth, 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

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

ti-chi-bot bot commented Jun 19, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-06-18 06:53:53.312216309 +0000 UTC m=+97759.797705139: ☑️ agreed by Leavrth.
  • 2024-06-19 06:22:01.204791514 +0000 UTC m=+182247.690280348: ☑️ agreed by YuJuncen.

@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit c12bf3f into pingcap:master Jun 19, 2024
32 checks passed
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 19, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 19, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 19, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 19, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
RidRisR added a commit to ti-chi-bot/tidb that referenced this pull request Jul 22, 2024
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Jul 22, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Aug 2, 2024
ti-chi-bot bot pushed a commit that referenced this pull request Sep 4, 2024
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. release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner 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.

br restore failed when injection network partition between one of tikv and other pods
6 participants