br: fix tiflash confilct #53658

RidRisR · 2024-05-29T10:22:04Z

What problem does this PR solve?

Issue Number: close #52628

Problem Summary:
Run PITR for multiple times could lead to tiflash crash

What changed and how does it work?

Added a new check to prevent pitr if there is tiflash replica on table in pitr range

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.

Prevent pitr when the target tables have tiflash replica

ti-chi-bot · 2024-05-29T10:22:08Z

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-05-29T10:22:21Z

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-05-30T07:36:59Z

Codecov Report

Attention: Patch coverage is 0% with 8 lines in your changes missing coverage. Please review.

Project coverage is 57.4860%. Comparing base (df64c34) to head (6e6da7c).
Report is 74 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #53658         +/-   ##
=================================================
- Coverage   72.4222%   57.4860%   -14.9362%     
=================================================
  Files          1505       1628        +123     
  Lines        430553     617694     +187141     
=================================================
+ Hits         311816     355088      +43272     
- Misses        99427     239095     +139668     
- Partials      19310      23511       +4201

Flag	Coverage Δ
integration	`39.0805% <0.0000%> (?)`
unit	`72.2871% <0.0000%> (+0.8856%)`	⬆️

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

Components	Coverage Δ
dumpling	`52.9656% <ø> (-1.0302%)`	⬇️
parser	`∅ <ø> (∅)`
br	`61.4984% <0.0000%> (+20.1113%)`	⬆️

RidRisR · 2024-05-30T08:02:51Z

/test pull-br-integration-test

tiprow · 2024-05-30T08:03:17Z

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

RidRisR · 2024-05-30T08:50:06Z

/test pull-br-integration-test

tiprow · 2024-05-30T08:50:28Z

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

RidRisR · 2024-05-31T03:31:02Z

/test pull-br-integration-test

tiprow · 2024-05-31T03:31: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.

br/pkg/task/stream.go

YuJuncen

rest lgtm

br/tests/br_tiflash_conflict/prepare_data/insert_data.sql

YuJuncen · 2024-06-03T08:48:47Z

br/tests/br_tiflash_conflict/prepare_data/insert_data.sql

@@ -0,0 +1,35 @@
+-- Switch to the test database


Also you may add license header in each file.

Seems that most .sql don't have a license header?

ti-chi-bot · 2024-06-03T09:50:12Z

[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:

~~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-06-03T09:50:14Z

[LGTM Timeline notifier]

Timeline:

2024-06-03 08:51:18.706146458 +0000 UTC m=+3284832.463282031: ☑️ agreed by YuJuncen.
2024-06-03 09:50:13.3868593 +0000 UTC m=+3288367.143994862: ☑️ agreed by Leavrth.

JaySon-Huang · 2024-06-05T11:07:46Z

br/pkg/restore/log_client/client.go

+			for _, table := range info.SchemaTables(schema) {
+				tableInfo := table.Meta()
+				if tableInfo.TiFlashReplica != nil && tableInfo.TiFlashReplica.Count > 0 {
+					return nil, errors.Errorf("exist table(s) have tiflash replica, please remove it before restore")


Can we give a more explicit reason which table(s) has tiflash replica in the error message?

We could, but it may make the error message too long to read

fix

fda4ec0

ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels May 29, 2024

ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 29, 2024

remove comment

b55a80f

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

RidRisR added 2 commits May 30, 2024 10:52

work

ffb38e6

intergration_test

2f12975

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/needs-triage-completed and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/needs-linked-issue labels May 30, 2024

fix

2b0fbfe

RidRisR changed the title ~~br: tiflash confilct~~ br: fix tiflash confilct May 30, 2024

ti-chi-bot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels May 30, 2024

RidRisR marked this pull request as ready for review May 30, 2024 07:03

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 May 30, 2024

lint

78d901f

Leavrth reviewed Jun 3, 2024

View reviewed changes

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

RidRisR added 2 commits June 3, 2024 16:36

refactor

383116c

modify test

f702331

RidRisR requested a review from Leavrth June 3, 2024 08:44

YuJuncen approved these changes Jun 3, 2024

View reviewed changes

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

newline character for text

6e6da7c

Leavrth approved these changes Jun 3, 2024

View reviewed changes

ti-chi-bot bot added the lgtm label Jun 3, 2024

ti-chi-bot bot removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jun 3, 2024

ti-chi-bot bot removed the do-not-merge/needs-triage-completed label Jun 5, 2024

ti-chi-bot bot merged commit 89adc33 into pingcap:master Jun 5, 2024
26 of 28 checks passed

JaySon-Huang reviewed Jun 5, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

br: fix tiflash confilct #53658

br: fix tiflash confilct #53658

RidRisR commented May 29, 2024 •

edited

Loading

ti-chi-bot bot commented May 29, 2024

tiprow bot commented May 29, 2024

codecov bot commented May 30, 2024 •

edited

Loading

RidRisR commented May 30, 2024

tiprow bot commented May 30, 2024

RidRisR commented May 30, 2024

tiprow bot commented May 30, 2024

RidRisR commented May 31, 2024

tiprow bot commented May 31, 2024

YuJuncen left a comment

YuJuncen Jun 3, 2024

RidRisR Jun 3, 2024

ti-chi-bot bot commented Jun 3, 2024

ti-chi-bot bot commented Jun 3, 2024

JaySon-Huang Jun 5, 2024

RidRisR Jun 6, 2024

br: fix tiflash confilct #53658

br: fix tiflash confilct #53658

Conversation

RidRisR commented May 29, 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 May 29, 2024

tiprow bot commented May 29, 2024

codecov bot commented May 30, 2024 • edited Loading

Codecov Report

RidRisR commented May 30, 2024

tiprow bot commented May 30, 2024

RidRisR commented May 30, 2024

tiprow bot commented May 30, 2024

RidRisR commented May 31, 2024

tiprow bot commented May 31, 2024

YuJuncen left a comment

Choose a reason for hiding this comment

YuJuncen Jun 3, 2024

Choose a reason for hiding this comment

RidRisR Jun 3, 2024

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 3, 2024

ti-chi-bot bot commented Jun 3, 2024

[LGTM Timeline notifier]

JaySon-Huang Jun 5, 2024

Choose a reason for hiding this comment

RidRisR Jun 6, 2024

Choose a reason for hiding this comment

RidRisR commented May 29, 2024 •

edited

Loading

codecov bot commented May 30, 2024 •

edited

Loading