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

lightning: fix data lost when partial write and server is busy #43769

Merged
merged 3 commits into from
May 15, 2023
Merged

lightning: fix data lost when partial write and server is busy #43769

merged 3 commits into from
May 15, 2023

Conversation

lance6716
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #43768

Problem Summary:

What is changed and how it works?

please see the linked issue

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

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
Copy link

ti-chi-bot bot commented May 12, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • D3Hunter
  • gozssky

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-triage-completed 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. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed do-not-merge/needs-triage-completed labels May 12, 2023
lance6716
lance6716 commented May 12, 2023
View reviewed changes
br/pkg/lightning/backend/local/local_test.go
cancel()
wg.Wait()

require.Equal(t, int64(2), f.importedKVCount.Load())
Copy link
Contributor Author

Choose a reason for hiding this comment

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

here is the check

@lance6716 lance6716 requested review from sleepymole and D3Hunter and removed request for sleepymole May 12, 2023 10:43
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 15, 2023
@D3Hunter
Copy link
Contributor

/run-integration-br-test

1 similar comment
@lance6716
Copy link
Contributor Author

/run-integration-br-test

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 15, 2023
D3Hunter
D3Hunter reviewed May 15, 2023
View reviewed changes
br/pkg/lightning/backend/local/local.go
@@ -1364,7 +1364,7 @@ func (local *Backend) executeJob(
job.lastRetryableErr = err
return nil
}
if job.stage == needRescan {
if job.stage != ingested {
Copy link
Contributor

Choose a reason for hiding this comment

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

add some comment below to explain why we continue on ingested state?

@lance6716
add comment
5415d7b 
Signed-off-by: lance6716 <[email protected]>
@lance6716
Copy link
Contributor Author

/run-integration-br-test

2 similar comments
@lance6716
Copy link
Contributor Author

/run-integration-br-test

@lance6716
Copy link
Contributor Author

/run-integration-br-test

@lance6716
Copy link
Contributor Author

https://ci.pingcap.net/blue/organizations/jenkins/br_ghpr_unit_and_integration_test/detail/br_ghpr_unit_and_integration_test/15860/pipeline/

lightning integration test passed

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 15, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 5415d7b

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 15, 2023
@lance6716
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit 4109534 into pingcap:master May 15, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request May 15, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot bot pushed a commit that referenced this pull request May 15, 2023
@ti-chi-bot
lightning: fix data lost when partial write and server is busy (#43769)…
e39eb2c 
… (#43833)

close #43768
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@D3Hunter D3Hunter D3Hunter approved these changes

@sleepymole sleepymole sleepymole approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. 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. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

lightning will skip importing data when "partial write" + "server is busy"
4 participants
@lance6716 @D3Hunter @ti-chi-bot @sleepymole