backup: fix the missing first store state during backup #53920

3pointer · 2024-06-11T06:00:25Z

What problem does this PR solve?

Issue Number: ref #52534
close #53926

Problem Summary:
The previous implementation of storewatch has the wrong beginning state. we must take the first step before the tick starts. Then the WithOnNewStoreRegistered will have the correct lastStore states to make computing results correct.

What changed and how does it work?

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

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

None

ti-chi-bot · 2024-06-11T06:00:27Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

tiprow · 2024-06-11T06:00:43Z

Hi @3pointer. 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.

codecov · 2024-06-11T07:06:37Z

Codecov Report

Attention: Patch coverage is 80.95238% with 12 lines in your changes missing coverage. Please review.

Project coverage is 56.5539%. Comparing base (0b54071) to head (1ab4765).
Report is 34 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #53920         +/-   ##
=================================================
- Coverage   74.5027%   56.5539%   -17.9489%     
=================================================
  Files          1508       1637        +129     
  Lines        358349     614917     +256568     
=================================================
+ Hits         266980     347760      +80780     
- Misses        71944     243579     +171635     
- Partials      19425      23578       +4153

Flag	Coverage Δ
integration	`38.9339% <66.6666%> (?)`
unit	`72.1159% <52.3809%> (-1.2633%)`	⬇️

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

Components	Coverage Δ
dumpling	`52.9656% <ø> (-2.2339%)`	⬇️
parser	`∅ <ø> (∅)`
br	`61.7712% <80.9523%> (+17.9560%)`	⬆️

Leavrth · 2024-06-12T03:22:35Z

br/pkg/backup/client.go

@@ -318,6 +332,7 @@ mainLoop:
 					mainCancel()
 					return err
 				}
+				allTxnLocks = append(allTxnLocks, lock)


lock maybe nil

Leavrth · 2024-06-12T03:26:27Z

br/pkg/backup/client.go

+		case *backuppb.Error_KvError:
+			if lockErr := v.KvError.Locked; lockErr != nil {
+				// collect locks for later resolving in this round
+				txnLock = txnlock.NewLock(lockErr)


can we return directly?

ti-chi-bot · 2024-06-14T03:37:59Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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~~ [BornChanger,Leavrth]

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-06-14T03:38:03Z

[LGTM Timeline notifier]

Timeline:

2024-06-12 03:26:39.844826361 +0000 UTC m=+521553.898138283: ☑️ agreed by Leavrth.
2024-06-14 03:38:02.128170352 +0000 UTC m=+695036.181482274: ☑️ agreed by BornChanger.

BornChanger · 2024-06-14T04:12:02Z

/retest

tiprow · 2024-06-14T04:12:25Z

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

In response to this:

/retest

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.

BornChanger · 2024-06-14T16:48:24Z

/run-pull-br-integration-test

BornChanger · 2024-06-17T02:18:42Z

/run-pull-br-integration-test

3pointer · 2024-06-17T04:15:57Z

/run-pull-br-integration-test

3pointer · 2024-06-17T05:06:53Z

/test pull-br-integration-test

ti-chi-bot · 2024-06-17T05:06:56Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build
/test check-dev
/test check-dev2
/test mysql-test
/test pull-br-integration-test
/test pull-integration-ddl-test
/test pull-lightning-integration-test
/test pull-mysql-client-test
/test unit-test

The following commands are available to trigger optional jobs:

/test canary-notify-when-compatibility-sections-changed
/test pingcap/tidb/canary_ghpr_unit_test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-nodejs-test
/test pull-sqllogic-test
/test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/ghpr_build
pingcap/tidb/ghpr_check
pingcap/tidb/ghpr_check2
pingcap/tidb/ghpr_mysql_test
pingcap/tidb/ghpr_unit_test
pingcap/tidb/pull_br_integration_test
pingcap/tidb/pull_integration_ddl_test
pingcap/tidb/pull_mysql_client_test

In response to this:

/test pull-br-integration-test

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/test-infra repository.

tiprow · 2024-06-17T05:07:15Z

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

In response to this:

/test pull-br-integration-test

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.

3pointer · 2024-06-17T05:07:45Z

/ok-to-test

3pointer · 2024-06-17T05:29:51Z

/test fast_test_tiprow

ti-chi-bot · 2024-06-17T05:29:54Z

@3pointer: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test build
/test check-dev
/test check-dev2
/test mysql-test
/test pull-br-integration-test
/test pull-integration-ddl-test
/test pull-lightning-integration-test
/test pull-mysql-client-test
/test unit-test

The following commands are available to trigger optional jobs:

/test canary-notify-when-compatibility-sections-changed
/test pingcap/tidb/canary_ghpr_unit_test
/test pull-common-test
/test pull-e2e-test
/test pull-integration-common-test
/test pull-integration-copr-test
/test pull-integration-jdbc-test
/test pull-integration-mysql-test
/test pull-integration-nodejs-test
/test pull-sqllogic-test
/test pull-tiflash-test

Use /test all to run the following jobs that were automatically triggered:

pingcap/tidb/ghpr_build
pingcap/tidb/ghpr_check
pingcap/tidb/ghpr_check2
pingcap/tidb/ghpr_mysql_test
pingcap/tidb/ghpr_unit_test
pingcap/tidb/pull_br_integration_test
pingcap/tidb/pull_integration_ddl_test
pingcap/tidb/pull_mysql_client_test

In response to this:

/test fast_test_tiprow

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/test-infra repository.

backup: fix the missing first store state during backup

9c9bb78

add test cases

42c5adb

ti-chi-bot bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/needs-tests-checked labels Jun 11, 2024

3pointer marked this pull request as ready for review June 11, 2024 06:50

ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 11, 2024

resolve locks for read

83c7ed4

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 Jun 12, 2024

update

f8f29d3

Leavrth approved these changes Jun 12, 2024

View reviewed changes

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

3pointer added 5 commits June 12, 2024 11:30

fix test

b2cae4b

address comment

189acb7

update

2409fa1

reduce the reset connection

e69ba9d

fix build

1ab4765

BornChanger approved these changes Jun 14, 2024

View reviewed changes

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

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

ti-chi-bot bot merged commit 3e180e2 into pingcap:master Jun 17, 2024
32 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backup: fix the missing first store state during backup #53920

backup: fix the missing first store state during backup #53920

3pointer commented Jun 11, 2024 •

edited

Loading

ti-chi-bot bot commented Jun 11, 2024

tiprow bot commented Jun 11, 2024

codecov bot commented Jun 11, 2024 •

edited

Loading

Leavrth Jun 12, 2024

Leavrth Jun 12, 2024

ti-chi-bot bot commented Jun 14, 2024

ti-chi-bot bot commented Jun 14, 2024

BornChanger commented Jun 14, 2024

tiprow bot commented Jun 14, 2024

BornChanger commented Jun 14, 2024

BornChanger commented Jun 17, 2024

3pointer commented Jun 17, 2024

3pointer commented Jun 17, 2024

ti-chi-bot bot commented Jun 17, 2024

tiprow bot commented Jun 17, 2024

3pointer commented Jun 17, 2024

3pointer commented Jun 17, 2024

ti-chi-bot bot commented Jun 17, 2024

backup: fix the missing first store state during backup #53920

backup: fix the missing first store state during backup #53920

Conversation

3pointer commented Jun 11, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Jun 11, 2024

tiprow bot commented Jun 11, 2024

codecov bot commented Jun 11, 2024 • edited Loading

Codecov Report

Leavrth Jun 12, 2024

Choose a reason for hiding this comment

Leavrth Jun 12, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 14, 2024

ti-chi-bot bot commented Jun 14, 2024

[LGTM Timeline notifier]

BornChanger commented Jun 14, 2024

tiprow bot commented Jun 14, 2024

BornChanger commented Jun 14, 2024

BornChanger commented Jun 17, 2024

3pointer commented Jun 17, 2024

3pointer commented Jun 17, 2024

ti-chi-bot bot commented Jun 17, 2024

tiprow bot commented Jun 17, 2024

3pointer commented Jun 17, 2024

3pointer commented Jun 17, 2024

ti-chi-bot bot commented Jun 17, 2024

3pointer commented Jun 11, 2024 •

edited

Loading

codecov bot commented Jun 11, 2024 •

edited

Loading