br: cli refactor backup error handling logic #54697

Tristan1900 · 2024-07-17T17:46:43Z

What problem does this PR solve?

Issue Number: close #54696

Problem Summary:

What changed and how does it work?

Moved backup specific error handling logic out of the retry file, since the retry is shared by other usages as well.
Renamed the method and a few other variables.
Move as much as possible of hardcoded strings to be const so unit test can use
Delete unused methods, handleErrorPb and HandleError
Delete and move the permission file, as in the file only one method is related to permission.

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

Release note

None

sre-bot · 2024-07-17T17:46:50Z

All committers have signed the CLA.

tiprow · 2024-07-17T17:47:01Z

Hi @Tristan1900. 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.

Tristan1900 · 2024-07-17T17:53:10Z

br/pkg/utils/error_handling.go

+}
+
+// messageIsNotFoundStorageError checks whether the message returning from TiKV is "NotFound" storage I/O error
+func messageIsNotFoundStorageError(msg string) bool {


@3pointer does the storage here mean S3 or any backup destination? At first I thought it's TiKV internal but there is a proto type for it already so got a bit confused. Thanks

at this context storage means TiKV.

codecov · 2024-07-17T18:13:31Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.0485%. Comparing base (eab8700) to head (7e3a7e9).
Report is 79 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #54697         +/-   ##
=================================================
- Coverage   72.8969%   59.0485%   -13.8485%     
=================================================
  Files          1552       1689        +137     
  Lines        437298     641310     +204012     
=================================================
+ Hits         318777     378684      +59907     
- Misses        98999     238962     +139963     
- Partials      19522      23664       +4142

Flag	Coverage Δ
integration	`41.0070% <65.8227%> (?)`
unit	`73.8962% <100.0000%> (+1.9599%)`	⬆️

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

Components	Coverage Δ
dumpling	`53.3749% <ø> (+0.4092%)`	⬆️
parser	`∅ <ø> (∅)`
br	`64.2386% <100.0000%> (+18.3439%)`	⬆️

3pointer · 2024-07-18T01:30:21Z

br/pkg/utils/error_handling.go

@@ -0,0 +1,181 @@
+package utils


new file should add license first, you can copy from other files.

ah! good catch

3pointer · 2024-07-18T01:34:12Z

br/pkg/utils/error_handling.go

+}
+
+// messageIsNotFoundStorageError checks whether the message returning from TiKV is "NotFound" storage I/O error
+func messageIsNotFoundStorageError(msg string) bool {


at this context storage means TiKV.

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

YuJuncen

rest lgtm

YuJuncen · 2024-07-19T02:46:51Z

br/pkg/utils/error_handling.go

+
+const (
+	// Retry error can be retried but will consume the backoff attempt quota.
+	Retry ErrorHandlingStrategy = iota


Perhaps use StrategyRetry so we can know its type when using outside this package.

good point on the namespace, let me rename it to something more meaningful

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

Tristan1900 · 2024-07-23T16:36:09Z

/retest-required

tiprow · 2024-07-23T16:36:32Z

@Tristan1900: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest-required

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 · 2024-07-24T22:42:26Z

[APPROVALNOTIFIER] This PR is APPROVED

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

~~br/OWNERS~~ [3pointer,YuJuncen]

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 · 2024-07-24T22:42:29Z

[LGTM Timeline notifier]

Timeline:

2024-07-24 02:06:42.012679596 +0000 UTC m=+1010824.003621067: ☑️ agreed by YuJuncen.
2024-07-24 22:42:28.077088041 +0000 UTC m=+1084970.068029511: ☑️ agreed by 3pointer.

Tristan1900 · 2024-07-25T14:50:45Z

/retest-required

tiprow · 2024-07-25T14:51:09Z

@Tristan1900: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest-required

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.

YuJuncen · 2024-07-26T01:31:38Z

/ok-to-test

Tristan1900 · 2024-07-26T02:11:21Z

/retest-required

Tristan1900 · 2024-07-26T14:08:22Z

/retest-required

Tristan1900 · 2024-07-26T15:24:56Z

/retest-required

tiprow · 2024-07-26T15:26:38Z

@Tristan1900: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
fast_test_tiprow	`7e3a7e9`	link	true	`/test fast_test_tiprow`

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

* upstream/master: (93 commits) disjoinset: add generic impl (pingcap#54917) planner: derive index filters for mv index paths (pingcap#54877) br: cli refactor backup error handling logic (pingcap#54697) expression: fix infinity loop in `timestampadd` (pingcap#54916) planner: import more expand test. (pingcap#54962) planner: use code-gen to generate CloneForPlanCache method for some operators (pingcap#54957) test: fix flaky test TestFailSchemaSyncer (pingcap#54958) planner: move logical show into logicalop pkg. (pingcap#54928) privilege: Remove TestAbnormalMySQLTable (pingcap#54925) resource_control: support unlimited keyword when setting the resource group (pingcap#54704) ddl: fix a data race on localRowCntListener Written() (pingcap#54484) lightning: fix SET SESSION on connection pool (pingcap#54927) planner: move logical mem-table to logicalop pkg. (pingcap#54903) table: Add `CachedTableSupport` and `TemporaryTableSupport` for `MutateContext` (pingcap#54900) executor: fix index_hash_join hang when context canceled (pingcap#54855) statistics: add metrics for unneeded analyze table (pingcap#54822) *: refine pipelined dml benchmarks (pingcap#54844) ddl: assign table IDs for jobs submitted to queue (pingcap#54880) *: avoid using Tables field of model.DBInfo, use API instead (pingcap#52302) planner: remove useless check (pingcap#54907) ...

close pingcap#54696

ti-chi-bot bot added do-not-merge/invalid-title do-not-merge/needs-linked-issue do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 17, 2024

ti-chi-bot bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jul 17, 2024

Tristan1900 changed the title ~~br cli refactor backup error handling logic~~ br: cli refactor backup error handling logic Jul 17, 2024

ti-chi-bot bot removed do-not-merge/invalid-title do-not-merge/needs-linked-issue labels Jul 17, 2024

Tristan1900 commented Jul 17, 2024

View reviewed changes

3pointer reviewed Jul 18, 2024

View reviewed changes

ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2024

Tristan1900 added 6 commits July 18, 2024 12:06

br cli refactor backup error handling logic

e8e870f

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

refactor test and minor

976ad25

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

fix bazel

f917357

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

fix bazel

597dd71

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

annotate TODO

0642669

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

use goimports, add license

62b39d0

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

Tristan1900 force-pushed the br-refactor-backup-error-handling branch from 0387ae6 to 62b39d0 Compare July 18, 2024 17:23

fix import in test....

6b994c9

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

YuJuncen reviewed Jul 19, 2024

View reviewed changes

ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2024

rename enum to be more meaningful

7e3a7e9

Signed-off-by: Wenqi Mou <wenqimou@gmail.com>

YuJuncen approved these changes Jul 24, 2024

View reviewed changes

ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 24, 2024

3pointer approved these changes Jul 24, 2024

View reviewed changes

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 24, 2024

ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Jul 26, 2024

ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 26, 2024

ti-chi-bot bot merged commit 197476a into pingcap:master Jul 26, 2024
43 of 48 checks passed

Tristan1900 deleted the br-refactor-backup-error-handling branch July 27, 2024 15:10

hawkingrei pushed a commit to hawkingrei/tidb that referenced this pull request Aug 1, 2024

br: cli refactor backup error handling logic (pingcap#54697)

fd8e30c

close pingcap#54696

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

br: cli refactor backup error handling logic #54697

br: cli refactor backup error handling logic #54697

Tristan1900 commented Jul 17, 2024 •

edited

Loading

sre-bot commented Jul 17, 2024 •

edited

Loading

tiprow bot commented Jul 17, 2024

Tristan1900 Jul 17, 2024 •

edited

Loading

3pointer Jul 18, 2024

codecov bot commented Jul 17, 2024 •

edited

Loading

3pointer Jul 18, 2024

Tristan1900 Jul 18, 2024

3pointer Jul 18, 2024

YuJuncen left a comment

YuJuncen Jul 19, 2024

Tristan1900 Jul 22, 2024 •

edited

Loading

Tristan1900 commented Jul 23, 2024

tiprow bot commented Jul 23, 2024

ti-chi-bot bot commented Jul 24, 2024

ti-chi-bot bot commented Jul 24, 2024

Tristan1900 commented Jul 25, 2024

tiprow bot commented Jul 25, 2024

YuJuncen commented Jul 26, 2024

Tristan1900 commented Jul 26, 2024

Tristan1900 commented Jul 26, 2024

Tristan1900 commented Jul 26, 2024

tiprow bot commented Jul 26, 2024

br: cli refactor backup error handling logic #54697

br: cli refactor backup error handling logic #54697

Conversation

Tristan1900 commented Jul 17, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

sre-bot commented Jul 17, 2024 • edited Loading

tiprow bot commented Jul 17, 2024

Tristan1900 Jul 17, 2024 • edited Loading

Choose a reason for hiding this comment

3pointer Jul 18, 2024

Choose a reason for hiding this comment

codecov bot commented Jul 17, 2024 • edited Loading

Codecov Report

3pointer Jul 18, 2024

Choose a reason for hiding this comment

Tristan1900 Jul 18, 2024

Choose a reason for hiding this comment

3pointer Jul 18, 2024

Choose a reason for hiding this comment

YuJuncen left a comment

Choose a reason for hiding this comment

YuJuncen Jul 19, 2024

Choose a reason for hiding this comment

Tristan1900 Jul 22, 2024 • edited Loading

Choose a reason for hiding this comment

Tristan1900 commented Jul 23, 2024

tiprow bot commented Jul 23, 2024

ti-chi-bot bot commented Jul 24, 2024

ti-chi-bot bot commented Jul 24, 2024

[LGTM Timeline notifier]

Tristan1900 commented Jul 25, 2024

tiprow bot commented Jul 25, 2024

YuJuncen commented Jul 26, 2024

Tristan1900 commented Jul 26, 2024

Tristan1900 commented Jul 26, 2024

Tristan1900 commented Jul 26, 2024

tiprow bot commented Jul 26, 2024

Tristan1900 commented Jul 17, 2024 •

edited

Loading

sre-bot commented Jul 17, 2024 •

edited

Loading

Tristan1900 Jul 17, 2024 •

edited

Loading

codecov bot commented Jul 17, 2024 •

edited

Loading

Tristan1900 Jul 22, 2024 •

edited

Loading