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

br: add more retryable error for retryer #43022

Merged
merged 7 commits into from
May 8, 2023
Merged

br: add more retryable error for retryer #43022

merged 7 commits into from
May 8, 2023

Conversation

Leavrth
Copy link
Contributor

@Leavrth Leavrth commented Apr 13, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #42909

Problem Summary:
some error is retryable, such as:

  1. io.EOF for getting ts from PD
  2. read: connection reset for connecting to s3

What is changed and how it works?

modify the shouldRetry logic

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

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

@Leavrth
add retry error
ab0df78 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 13, 2023 •
edited by ti-chi-bot bot
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • YuJuncen

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 do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 13, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented Apr 14, 2023

/check-issue-triage-complete

YuJuncen
YuJuncen approved these changes Apr 14, 2023
View reviewed changes
br/pkg/utils/backoff.go
@@ -194,11 +194,11 @@ func (bo *pdReqBackoffer) NextBackoff(err error) time.Duration {
// bo.attempt--
e := errors.Cause(err)
switch e { // nolint:errorlint
case nil, context.Canceled, context.DeadlineExceeded, io.EOF, sql.ErrNoRows:
case nil, context.Canceled, context.DeadlineExceeded, sql.ErrNoRows:
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we'd better to figure out why io.EOF isn't retryable from beginning.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess just move code from lightning.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 14, 2023
3pointer
3pointer reviewed Apr 17, 2023
View reviewed changes
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.

can we add a test case here?

@Leavrth
add unit test
bf6af39 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@Leavrth
add unit test
093b38e 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-6.5 needs-cherry-pick-release-7.1 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/needs-triage-completed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 24, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Apr 24, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Apr 24, 2023
@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot Apr 24, 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 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 8, 2023

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

Commit hash: 093b38e

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/merge

@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/retest

@ti-chi-bot ti-chi-bot bot deleted a comment from ti-chi-bot May 8, 2023
@Leavrth
remove empty line
4642cca 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 8, 2023

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

Commit hash: 4642cca

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
change back the bazel version
9436bd1 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 8, 2023

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

Commit hash: 9436bd1

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
Merge branch 'master' into fix-retry
4cc806b
@Leavrth
make bazel_prepare
19f8d3e 
Signed-off-by: Leavrth <jianjun.liao@outlook.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 8, 2023

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

Commit hash: 19f8d3e

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 8, 2023
@Leavrth
Copy link
Contributor Author

Leavrth commented May 8, 2023

/retest

@ti-chi-bot ti-chi-bot bot merged commit 2d259bd into pingcap:master May 8, 2023
6 checks passed
@ti-chi-bot ti-chi-bot mentioned this pull request May 8, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request May 8, 2023
@Leavrth @ti-chi-bot
This is an automated cherry-pick of pingcap#43022
6491990 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request May 8, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot bot pushed a commit that referenced this pull request May 8, 2023
@ti-chi-bot
br: add more retryable error for retryer (#43022) (#43613)
ae2c5bd 
close #42909
ti-chi-bot bot pushed a commit that referenced this pull request Jun 26, 2023
@ti-chi-bot
br: add more retryable error for retryer (#43022) (#43611)
464dc82 
close #42909
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@YuJuncen YuJuncen YuJuncen approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.5 needs-cherry-pick-release-7.1 release-note-none 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

br: full backup failed 'failed to flush checkpoint: RequestError: send request failed'
4 participants
@Leavrth @ti-chi-bot @3pointer @YuJuncen