br: disk space check follow up #54596

RidRisR · 2024-07-12T08:22:37Z

What problem does this PR solve?

Issue Number: ref #54316, #54470

Problem Summary:

What changed and how does it work?

Now, the preserve rate of tiflash is set 1.3
Add more log and normalized errors
Fix the error that TiFlashReplicas is not set

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.

Now, the preserve rate of tiflash is set 1.3
Add more log and normalized errors
Fix the error that `TiFlashReplicas` is not se

tiprow · 2024-07-12T08:23:06Z

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.

codecov · 2024-07-12T08:53:32Z

Codecov Report

Attention: Patch coverage is 54.16667% with 11 lines in your changes missing coverage. Please review.

Project coverage is 56.6835%. Comparing base (60cc666) to head (79b798a).
Report is 8 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #54596         +/-   ##
=================================================
- Coverage   72.7687%   56.6835%   -16.0852%     
=================================================
  Files          1555       1680        +125     
  Lines        437788     612560     +174772     
=================================================
+ Hits         318573     347221      +28648     
- Misses        99617     241633     +142016     
- Partials      19598      23706       +4108

Flag	Coverage Δ
integration	`38.5397% <56.5217%> (?)`
unit	`71.9487% <0.0000%> (+0.1649%)`	⬆️

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

Components	Coverage Δ
dumpling	`52.9656% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`62.9109% <54.1666%> (+17.0496%)`	⬆️

Tristan1900

LGTM, thanks for the change!

Tristan1900 · 2024-07-15T23:08:58Z

br/pkg/task/restore.go

 	if storeCnt == 0 {
 		return 0
 	}
-	var totalSize uint64 = 0
+	if replicaCnt > storeCnt {
+		replicaCnt = storeCnt


@3pointer just to double check, do we have topology constraint that makes sure no more than 1 replica from the same resign placed on the same store?

Yes, our raft implementation make this constraint

Tristan1900 · 2024-07-15T23:12:25Z

br/pkg/task/restore.go

@@ -1240,37 +1240,41 @@ func getStores(ctx context.Context, mgr *conn.Mgr) (stores *http.StoresInfo, err
 	return stores, nil
 }

-func EstimateTikvUsage(files []*backuppb.File, maxReplica uint64, storeCnt int) uint64 {
+func EstimateTikvUsage(files []*backuppb.File, replicaCnt uint64, storeCnt uint64) uint64 {


nit, a more common name could be replicationFactor or rf

ti-chi-bot · 2024-07-15T23:22:57Z

@Tristan1900: adding LGTM is restricted to approvers and reviewers in OWNERS files.

In response to this:

LGTM, thanks for the change!

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.

br/pkg/task/restore.go

RidRisR · 2024-07-19T02:10:51Z

/test pull-br-integration-test

RidRisR · 2024-07-19T02:10:58Z

/test check-dev2

RidRisR · 2024-07-19T02:11:06Z

/test unit-test

tiprow · 2024-07-19T02:11:13Z

@RidRisR: 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.

tiprow · 2024-07-19T02:11:19Z

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

In response to this:

/test check-dev2

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.

tiprow · 2024-07-19T02:11:27Z

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

In response to this:

/test unit-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.

ti-chi-bot · 2024-07-22T07:52:13Z

[APPROVALNOTIFIER] This PR is APPROVED

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

~~OWNERS~~ [Leavrth,YuJuncen]
~~br/OWNERS~~ [Leavrth,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-22T07:52:16Z

[LGTM Timeline notifier]

Timeline:

2024-07-16 06:04:06.543141546 +0000 UTC m=+333868.534083017: ☑️ agreed by YuJuncen.
2024-07-22 07:52:15.066592466 +0000 UTC m=+858757.057533936: ☑️ agreed by Leavrth.

tiprow · 2024-07-22T07:59:27Z

@RidRisR: 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	`c679524`	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.

RidRisR · 2024-07-22T08:17:53Z

/test fast_test_tiprow

ti-chi-bot · 2024-07-22T08:17:56Z

@RidRisR: 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.

tiprow · 2024-07-22T08:18:14Z

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

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

RidRisR · 2024-07-23T03:52:02Z

/test pull-br-integration-test

tiprow · 2024-07-23T03:52:23Z

@RidRisR: 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.

ti-chi-bot · 2024-07-29T06:12:54Z

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

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot bot added do-not-merge/needs-tests-checked release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 12, 2024

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. labels Jul 12, 2024

RidRisR changed the title ~~br: preserve more space for tiflash~~ br: preserve space for tiflash follow up Jul 12, 2024

RidRisR changed the title ~~br: preserve space for tiflash follow up~~ br: disk space check follow up Jul 12, 2024

ti-chi-bot bot removed the do-not-merge/needs-tests-checked label Jul 12, 2024

RidRisR force-pushed the estimate branch from 5ad7071 to f166e35 Compare July 12, 2024 09:40

Tristan1900 mentioned this pull request Jul 15, 2024

br: refactor br cli backoff logic #54644

Merged

13 tasks

Tristan1900 approved these changes Jul 15, 2024

View reviewed changes

YuJuncen approved these changes Jul 16, 2024

View reviewed changes

br/pkg/task/restore.go Outdated Show resolved Hide resolved

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

Leavrth approved these changes Jul 22, 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 22, 2024

RidRisR added 8 commits July 22, 2024 16:29

fix

75f7105

fix more

d6382dc

remove comment

b93cdb3

lint

816245d

fix build

0260a3e

add uints.PB

28cc133

fix bazel

f52d72f

Update preserve ratio

79b798a

RidRisR force-pushed the estimate branch from c679524 to 79b798a Compare July 22, 2024 08:30

ti-chi-bot bot merged commit d662428 into pingcap:master Jul 23, 2024
26 checks passed

ti-chi-bot added needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. and removed needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Jul 29, 2024

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jul 29, 2024

This is an automated cherry-pick of pingcap#54596

18da8a4

Signed-off-by: ti-chi-bot <[email protected]>

ti-chi-bot mentioned this pull request Jul 29, 2024

br: disk space check follow up (#54596) #54996

Open

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

br: disk space check follow up #54596

br: disk space check follow up #54596

RidRisR commented Jul 12, 2024 •

edited

Loading

tiprow bot commented Jul 12, 2024

codecov bot commented Jul 12, 2024 •

edited

Loading

Tristan1900 left a comment

Tristan1900 Jul 15, 2024

3pointer Jul 19, 2024

Tristan1900 Jul 15, 2024

ti-chi-bot bot commented Jul 15, 2024

RidRisR commented Jul 19, 2024

RidRisR commented Jul 19, 2024

RidRisR commented Jul 19, 2024

tiprow bot commented Jul 19, 2024

tiprow bot commented Jul 19, 2024

tiprow bot commented Jul 19, 2024

ti-chi-bot bot commented Jul 22, 2024

ti-chi-bot bot commented Jul 22, 2024

tiprow bot commented Jul 22, 2024

RidRisR commented Jul 22, 2024

ti-chi-bot bot commented Jul 22, 2024

tiprow bot commented Jul 22, 2024

RidRisR commented Jul 23, 2024

tiprow bot commented Jul 23, 2024

ti-chi-bot commented Jul 29, 2024

br: disk space check follow up #54596

br: disk space check follow up #54596

Conversation

RidRisR commented Jul 12, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

tiprow bot commented Jul 12, 2024

codecov bot commented Jul 12, 2024 • edited Loading

Codecov Report

Tristan1900 left a comment

Choose a reason for hiding this comment

Tristan1900 Jul 15, 2024

Choose a reason for hiding this comment

3pointer Jul 19, 2024

Choose a reason for hiding this comment

Tristan1900 Jul 15, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jul 15, 2024

RidRisR commented Jul 19, 2024

RidRisR commented Jul 19, 2024

RidRisR commented Jul 19, 2024

tiprow bot commented Jul 19, 2024

tiprow bot commented Jul 19, 2024

tiprow bot commented Jul 19, 2024

ti-chi-bot bot commented Jul 22, 2024

ti-chi-bot bot commented Jul 22, 2024

[LGTM Timeline notifier]

tiprow bot commented Jul 22, 2024

RidRisR commented Jul 22, 2024

ti-chi-bot bot commented Jul 22, 2024

tiprow bot commented Jul 22, 2024

RidRisR commented Jul 23, 2024

tiprow bot commented Jul 23, 2024

ti-chi-bot commented Jul 29, 2024

RidRisR commented Jul 12, 2024 •

edited

Loading

codecov bot commented Jul 12, 2024 •

edited

Loading