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.

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

local backend: fix log been eaten when failed on execute region job (#47782) #47815

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #47782

What problem does this PR solve?

Issue Number: close #47781

Problem Summary:

What is changed and how it works?

log error of worker waitgroup if it's not context cancelled

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
    temporary change code, send a dummy job in generateAndSendJob then wait 5 second, and let executeJob always return the remaining storage capacity of TiKV error, see we can see the eaten log
[2023/10/19 16:01:56.812 +08:00] [ERROR] [local.go:1677] ["worker meets error"] [error="the remaining storage capacity of TiKV(%!s(MISSING)) is less than 10%; please increase the storage capacity of TiKV
and try again"] [errorVerbose="the remaining storage capacity of TiKV(%!s(MISSING)) is less than 10%; please increase the storage capacity of TiKV and try again\ngithub.com/pingcap/tidb/br/pkg/lightning/b
ackend/local.(*Backend).executeJob\n\t/Users/jujiajia/code/pingcap/tidb/br/pkg/lightning/backend/local/local.go:1405\ngithub.com/pingcap/tidb/br/pkg/lightning/backend/local.(*Backend).startWorker\n\t/Users/jujiajia/code/pingcap/tidb/br/pkg/lightning/backend/local/local.go:1340\ngithub.com/pingcap/tidb/br/pkg/lightning/backend/local.(*Backend).doImport.func5\n\t/Users/jujiajia/code/pingcap/tidb/br/pkg/lightning/backend/local/local.go:1657\ngolang.org/x/sync/errgroup.(*Group).Go.func1\n\t/Users/jujiajia/go/pkg/mod/golang.org/x/sync@v0.3.0/errgroup/errgroup.go:75\nruntime.goexit\n\t/usr/local/go/src/runtime/asm_arm64.s:1197"]
  • 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 added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Oct 19, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Oct 19, 2023
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 20, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 20, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: D3Hunter, 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 added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Oct 20, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Oct 20, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-10-20 02:14:40.979385029 +0000 UTC m=+1968878.566495175: ☑️ agreed by D3Hunter.
  • 2023-10-20 02:17:37.515691259 +0000 UTC m=+1969055.102801404: ☑️ agreed by lance6716.

@D3Hunter
Copy link
Contributor

/retest

@ti-chi-bot ti-chi-bot bot merged commit dfc40e3 into pingcap:release-7.5 Oct 20, 2023
15 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-7.5 This PR is cherry-picked to release-7.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants