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 risk of OOM (#40443) #44333

Merged
merged 2 commits into from
Jun 1, 2023
Merged

lightning: fix risk of OOM (#40443) #44333

merged 2 commits into from
Jun 1, 2023

Conversation

lance6716
Copy link
Contributor

This is a manually cherry-pick of #40232 and #40443

What problem does this PR solve?

Issue Number: close #40400

Problem Summary:

What is changed and how it works?

  • check if the buf has exceeded the max length of transaction

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

buchuitoudegou and others added 2 commits June 1, 2023 16:36
@buchuitoudegou @joccau @lance6716
lightning: not set pos to end if fail to ReadUntil (pingcap#40232)
fb3cf4e 
* fix: not set pos to end

* add it

* fix: return to prevPos

* fix: return err

* fix

* fix

* fix it

* fix

* fix: not exit when err

Co-authored-by: Zak Zhao <57036248+joccau@users.noreply.github.com>
@buchuitoudegou @ti-chi-bot @lance6716
lightning: fix risk of OOM (pingcap#40443)
bf8c7b5 
* fix: check buf size

* fix: terminate too long buf

* add ut

* fix dev

* local var

* fix ut

* fix lint

* fix lint

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 1, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • GMHDBJD
  • 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/cherry-pick-not-approved 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 1, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jun 1, 2023
GMHDBJD
GMHDBJD approved these changes Jun 1, 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

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 1, 2023
@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 Jun 1, 2023
@lance6716
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented Jun 1, 2023

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

Commit hash: bf8c7b5

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

/retest

3 similar comments
@lance6716
Copy link
Contributor Author

/retest

@lance6716
Copy link
Contributor Author

/retest

@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit bb2e845 into pingcap:release-6.5 Jun 1, 2023
@ti-chi-bot ti-chi-bot added cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. labels Jun 14, 2023
@lance6716
Copy link
Contributor Author

/cherry-pick release-6.1

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

@lance6716: new pull request created to branch release-6.1: #45072.

In response to this:

/cherry-pick release-6.1

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 pushed a commit to ti-chi-bot/tidb that referenced this pull request Jun 30, 2023
@lance6716 @ti-chi-bot
This is an automated cherry-pick of pingcap#44333
56b2329 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Jun 30, 2023
@ti-chi-bot
lightning: fix risk of OOM (#40443) (#44333) (#45072)
5e0977a 
close #40400
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GMHDBJD GMHDBJD GMHDBJD approved these changes

@sleepymole sleepymole sleepymole approved these changes

Assignees
No one assigned
Labels
cherry-pick-approved Cherry pick PR approved by release team. 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. 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.
7 participants
@lance6716 @hawkingrei @ti-chi-bot @sleepymole @GMHDBJD @VelocityLight @buchuitoudegou