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

global sort: fix inner retry doesn't reset collector #52965

Merged
merged 1 commit into from
Apr 29, 2024

Conversation

lance6716
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #52884

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

Signed-off-by: lance6716 <lance6716@gmail.com>
@ti-chi-bot ti-chi-bot bot added release-note-none size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 29, 2024
Copy link

tiprow bot commented Apr 29, 2024

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

@lance6716
Copy link
Contributor Author

/ok-to-test

@@ -536,6 +535,7 @@ func (w *Writer) flushSortedKVs(ctx context.Context) (string, string, error) {
_ = statWriter.Close(ctx)
}
}()
w.rc.reset()
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the fix is here

Copy link

codecov bot commented Apr 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 56.7329%. Comparing base (1d698c7) to head (a2139d9).
Report is 12 commits behind head on master.

Additional details and impacted files
@@                Coverage Diff                @@
##             master     #52965         +/-   ##
=================================================
- Coverage   72.3811%   56.7329%   -15.6482%     
=================================================
  Files          1482       1622        +140     
  Lines        428743     608142     +179399     
=================================================
+ Hits         310329     345017      +34688     
- Misses        99115     238923     +139808     
- Partials      19299      24202       +4903     
Flag Coverage Δ
integration 39.4872% <100.0000%> (?)
unit 71.2874% <100.0000%> (+0.0688%) ⬆️

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

Components Coverage Δ
dumpling 53.9957% <ø> (ø)
parser ∅ <ø> (∅)
br 62.0408% <ø> (+20.8968%) ⬆️

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

Copy link

ti-chi-bot bot commented Apr 29, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

Copy link

ti-chi-bot bot commented Apr 29, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-04-29 08:24:23.990930731 +0000 UTC m=+259217.748066299: ☑️ agreed by D3Hunter.
  • 2024-04-29 13:17:23.608594067 +0000 UTC m=+276797.365729640: ☑️ agreed by Benjamin2037.

@lance6716
Copy link
Contributor Author

/retest

@ti-chi-bot ti-chi-bot bot merged commit c60f97d into pingcap:master Apr 29, 2024
38 of 52 checks passed
@ti-chi-bot
Copy link
Member

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-8.1 ok-to-test release-note-none size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

global sort IMPORT INTO deadlock due to large tasks
4 participants