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

stmtv2: ignore corrupted line when scan #41374

Merged
merged 3 commits into from
Feb 14, 2023
Merged

stmtv2: ignore corrupted line when scan #41374

merged 3 commits into from
Feb 14, 2023

Conversation

zhongzc
Copy link
Contributor

@zhongzc zhongzc commented Feb 14, 2023

Signed-off-by: zhongzc zhongzc_arch@outlook.com

What problem does this PR solve?

Issue Number: close #41373

Problem Summary:

What is changed and how it works?

Ignore lines that fail to unmarshal

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

@zhongzc
stmtv2: ignore corrupted line when scan
c049448 
Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 14, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • crazycs520
  • mornyx

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 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. labels Feb 14, 2023
mornyx
mornyx reviewed Feb 14, 2023
View reviewed changes
util/stmtsummary/v2/reader.go
Comment on lines -391 to +392
close(rowsCh) // task done
mgrWg.Wait()
close(rowsCh) // task done
Copy link
Contributor

Choose a reason for hiding this comment

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

Is the corrupted line caused by this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No. But if err occurs, closing rowsCh before workers are done can cause sending to a closed channel and then panic.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 14, 2023
@zhongzc
fix lint
c264342 
Signed-off-by: zhongzc <zhongzc_arch@outlook.com>
@hawkingrei hawkingrei mentioned this pull request Feb 14, 2023
Merged
12 tasks
@zhongzc
Copy link
Contributor Author

zhongzc commented Feb 14, 2023

/run-check-issue-triage-complete

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 14, 2023
tangenta
tangenta reviewed Feb 14, 2023
View reviewed changes
util/stmtsummary/v2/reader.go
@@ -740,7 +748,7 @@ func (w *stmtParseWorker) run(
func (w *stmtParseWorker) handleLines(
lines [][]byte,
rowsCh chan<- [][]types.Datum,
errCh chan<- error,
_ chan<- error,
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not remove it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In case it becomes needed in future

@crazycs520
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c9584f5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 14, 2023
@ti-chi-bot ti-chi-bot merged commit 2f69ba3 into pingcap:master Feb 14, 2023
blacktear23 pushed a commit to blacktear23/tidb that referenced this pull request Feb 15, 2023
@zhongzc @blacktear23
stmtv2: ignore corrupted line when scan (pingcap#41374)
b1bd7c3 
close pingcap#41373
ghazalfamilyusa pushed a commit to ghazalfamilyusa/tidb that referenced this pull request Feb 15, 2023
@zhongzc @ghazalfamilyusa
stmtv2: ignore corrupted line when scan (pingcap#41374)
27136fe 
close pingcap#41373
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tangenta tangenta tangenta left review comments

@mornyx mornyx mornyx approved these changes

@crazycs520 crazycs520 crazycs520 approved these changes

Assignees
No one assigned
Labels
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.

statement v2 returns error with corrupted line
5 participants
@zhongzc @ti-chi-bot @crazycs520 @tangenta @mornyx