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

local backend: fix sst skip ingest when multiIngest=false and exhausted retry count #50282

Merged
merged 2 commits into from
Jan 24, 2024
Merged

local backend: fix sst skip ingest when multiIngest=false and exhausted retry count #50282

merged 2 commits into from
Jan 24, 2024

Conversation

D3Hunter
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #50198

Problem Summary:

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

  • 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

@ti-chi-bot ti-chi-bot bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 10, 2024
@tiprow tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 10, 2024
@D3Hunter
Copy link
Contributor Author

cc @mittalrishabh

@D3Hunter
Copy link
Contributor Author

/test pull-lightning-integration-test

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 10, 2024

@D3Hunter: 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 unit-test

The following commands are available to trigger optional jobs:

  • /test pull-br-integration-test

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

  • pingcap/tidb/release-6.5/ghpr_build
  • pingcap/tidb/release-6.5/ghpr_check
  • pingcap/tidb/release-6.5/ghpr_check2
  • pingcap/tidb/release-6.5/ghpr_mysql_test
  • pingcap/tidb/release-6.5/ghpr_unit_test

In response to this:

/test pull-lightning-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 tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

In response to this:

/test pull-lightning-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.

@D3Hunter
Copy link
Contributor Author

/run-integration-br-test

@D3Hunter
Copy link
Contributor Author

/test run-integration-br-test

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 10, 2024

@D3Hunter: 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 unit-test

The following commands are available to trigger optional jobs:

  • /test pull-br-integration-test

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

  • pingcap/tidb/release-6.5/ghpr_build
  • pingcap/tidb/release-6.5/ghpr_check
  • pingcap/tidb/release-6.5/ghpr_check2
  • pingcap/tidb/release-6.5/ghpr_mysql_test
  • pingcap/tidb/release-6.5/ghpr_unit_test

In response to this:

/test run-integration-br-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 tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

In response to this:

/test run-integration-br-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.

@D3Hunter
Copy link
Contributor Author

/test pull-br-integration-test

@tiprow tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

@D3Hunter
Copy link
Contributor Author

/hold

to wait ci

@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 Jan 10, 2024
@D3Hunter
Copy link
Contributor Author

/retest

@tiprow tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

@codecov Codecov
Copy link

codecov bot commented Jan 10, 2024 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-6.5@6a5b2a3). Click here to learn what that means.
The diff coverage is n/a.

Additional details and impacted files 
@@               Coverage Diff                @@
##             release-6.5     #50282   +/-   ##
================================================
  Coverage               ?   73.9239%           
================================================
  Files                  ?       1094           
  Lines                  ?     353424           
  Branches               ?          0           
================================================
  Hits                   ?     261265           
  Misses                 ?      75592           
  Partials               ?      16567

@D3Hunter
Copy link
Contributor Author

/retest

@tiprow tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jan 10, 2024
@D3Hunter
Copy link
Contributor Author

/test pull-br-integration-test

@tiprow tiprow
Copy link

tiprow bot commented Jan 10, 2024

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

mittalrishabh
mittalrishabh reviewed Jan 10, 2024
View reviewed changes
br/pkg/lightning/backend/local/local.go
@@ -1531,19 +1531,18 @@ loopWrite:
continue
}
}
if err != nil {
Copy link
Contributor

@mittalrishabh mittalrishabh Jan 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

if error is because of suspended, should we try to add more backoff time as we know that it can take some time(60 seconds) to get unsuspended. It will prevent unnecessary re writes.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

this pr only tries to fix the bug

for the Pause Ingest introduced by EBS BR, we need to handle it in whole later

@D3Hunter
Copy link
Contributor Author

ci pass https://do.pingcap.net/jenkins/blue/organizations/jenkins/pingcap%2Ftidb%2Frelease-6.5%2Fpull_br_integration_test/detail/pull_br_integration_test/8/pipeline

@D3Hunter
Copy link
Contributor Author

/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 Jan 11, 2024
Benjamin2037
Benjamin2037 approved these changes Jan 24, 2024
View reviewed changes
Copy link
Collaborator

@Benjamin2037 Benjamin2037 left a comment

Choose a reason for hiding this comment

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

LGTM

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

ti-chi-bot bot commented Jan 24, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-01-10 11:16:14.138490578 +0000 UTC m=+441963.722744266: ☑️ agreed by lance6716.
  • 2024-01-24 12:50:43.02957923 +0000 UTC m=+965084.593876935: ☑️ agreed by Benjamin2037.

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Jan 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Benjamin2037, lance6716

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:

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 ti-chi-bot bot merged commit 3e693f8 into pingcap:release-6.5 Jan 24, 2024
20 checks passed
@D3Hunter D3Hunter deleted the fix-ingest-err-ignore branch January 25, 2024 05:46
guoshouyan pushed a commit to guoshouyan/tidb that referenced this pull request Mar 5, 2024
@D3Hunter
local backend: fix sst skip ingest when multiIngest=false and exhaust…
4d8dfde 
…ed retry count (pingcap#50282) (pingcap#43)

close pingcap#50198

Co-authored-by: D3Hunter <jujj603@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mittalrishabh mittalrishabh mittalrishabh left review comments

@Benjamin2037 Benjamin2037 Benjamin2037 approved these changes

@lance6716 lance6716 lance6716 approved these changes

Assignees
No one assigned
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@D3Hunter @lance6716 @Benjamin2037 @mittalrishabh @ti-chi-bot