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 "context cancel" overwrites the real error #44734

Merged
merged 2 commits into from
Jun 21, 2023
Merged

lightning: fix "context cancel" overwrites the real error #44734

merged 2 commits into from
Jun 21, 2023

Conversation

lance6716
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #44733

Problem Summary:

What is changed and how it works?

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

@lance6716
lightning: fix "context cancel" overwrites the real error
82ca799 
Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot bot added 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/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 16, 2023
GMHDBJD
GMHDBJD approved these changes Jun 16, 2023
View reviewed changes
Copy link
Contributor

@GMHDBJD GMHDBJD left a comment

Choose a reason for hiding this comment

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

LGTM

br/pkg/lightning/backend/local/local.go
Comment on lines -1148 to 1150
select {
case <-egCtx.Done():
if egCtx.Err() != nil {
return nil
default:
}
Copy link
Contributor

Choose a reason for hiding this comment

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

any difference?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

select {} will lock the channel to read the value so performance is better. And code becomes shorter

@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 16, 2023
D3Hunter
D3Hunter reviewed Jun 16, 2023
View reviewed changes
br/pkg/lightning/backend/local/local.go
jobs, err := local.generateJobForRange(egCtx, engine, r, regionSplitSize, regionSplitKeys)
if err != nil {
if common.IsContextCanceledError(err) {
return nil
Copy link
Contributor

Choose a reason for hiding this comment

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

if we return nil here, caller will continue running

Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's expected? because context is egCtx and in line 1148 they will fail fast.

Copy link
Contributor

@D3Hunter D3Hunter Jun 16, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

will this happen:

  • parent ctx cancelled,generateAndSendJob returns nil
  • all workers returns nil on ctx.Done()
  • then we log that engine import success

maybe add ctx.Err into firstErr before return

Copy link
Contributor Author

Choose a reason for hiding this comment

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

2d3ca6b

@lance6716
Copy link
Contributor Author

/retest

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, GMHDBJD

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 added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jun 16, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 16, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-06-16 08:50:16.189708395 +0000 UTC m=+334812.604312471: ☑️ agreed by GMHDBJD.
  • 2023-06-16 10:49:12.731159297 +0000 UTC m=+341949.145763369: ☑️ agreed by D3Hunter.

@D3Hunter
Copy link
Contributor

/hold

@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 Jun 16, 2023
@lance6716
address comment
2d3ca6b 
Signed-off-by: lance6716 <lance6716@gmail.com>
@D3Hunter
Copy link
Contributor

/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 Jun 20, 2023
@lance6716
Copy link
Contributor Author

/retest

1 similar comment
@lance6716
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit 9c0f657 into pingcap:master Jun 21, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Jun 21, 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: #44858.

@lance6716
Copy link
Contributor Author

/cherry-pick release-7.2

@ti-chi-bot ti-chi-bot mentioned this pull request Jun 27, 2023
Merged
12 tasks
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot
Copy link
Member

@lance6716: new pull request could not be created: failed to create pull request against pingcap/tidb#release-7.2 from head ti-chi-bot:cherry-pick-44734-to-release-7.2: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for ti-chi-bot:cherry-pick-44734-to-release-7.2."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"}

In response to this:

/cherry-pick release-7.2

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 ti-community-infra/tichi repository.

ti-chi-bot bot pushed a commit that referenced this pull request Jun 27, 2023
@ti-chi-bot
lightning: fix "context cancel" overwrites the real error (#44734) (#…
9fd5f4a 
…45000)

close #44733
ti-chi-bot bot pushed a commit that referenced this pull request Jul 13, 2023
@ti-chi-bot
lightning: fix "context cancel" overwrites the real error (#44734) (#…
399dd0d 
…44858)

close #44733
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

@GMHDBJD GMHDBJD GMHDBJD approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.2 release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

lightning may return "context cancel" error when TiKV disk is slow
4 participants
@lance6716 @D3Hunter @ti-chi-bot @GMHDBJD