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

sorter(ticdc): use correct cgroup memory limit in some scenarios (#8589) #8623

Merged
merged 6 commits into from
Mar 27, 2023
Merged

sorter(ticdc): use correct cgroup memory limit in some scenarios (#8589) #8623

merged 6 commits into from
Mar 27, 2023

Conversation

ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Mar 22, 2023 •
edited by amyangfei
Loading

This is an automated cherry-pick of #8589

What problem does this PR solve?

Issue Number: close #8588

What is changed and how it works?

Use a better way to fetch cgroup memory limit.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Have been verified in the following scenarios

  • systemd cgroup enabled
  • systemd cgroup not enabled
  • docker run container under containerd-shim-runc-v2 with memory limit
  • docker run container under containerd-shim-runc-v2 without memory limit
  • K8s starts pod with memory limit
  • K8s starts pod without memory limit

Questions

Will it cause performance regression or break compatibility?
Do you need to update user documentation, design documentation or monitoring documentation?

Release note 

Use correct cgroup memory limit in db sorter under some scenarios.

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Mar 22, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 22, 2023
Merged
6 tasks
@ti-chi-bot ti-chi-bot added area/ticdc Issues or PRs related to TiCDC. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. labels Mar 22, 2023
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 22, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Mar 23, 2023
@amyangfei amyangfei force-pushed the cherry-pick-8589-to-release-6.1 branch from 23f4447 to 435e811 Compare March 27, 2023 02:41
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2023
@amyangfei amyangfei force-pushed the cherry-pick-8589-to-release-6.1 branch from f68cb32 to d011bf5 Compare March 27, 2023 03:04
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 27, 2023
@amyangfei
Copy link
Contributor

/run-all-tests

amyangfei
amyangfei reviewed Mar 27, 2023
View reviewed changes
pkg/util/cgroup/cgroups.go
// See the License for the specific language governing permissions and
//
// ============================================================
// Forked from https://github.com/KimMachineGun/automemlimit
Copy link
Contributor

Choose a reason for hiding this comment

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

github.com/KimMachineGun/automemlimit requires go >= 1.19, so fork the cgroup part to fit go 1.18 in release-6.1

@amyangfei
Copy link
Contributor

/run-all-tests

2 similar comments
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei amyangfei force-pushed the cherry-pick-8589-to-release-6.1 branch from dbe0d38 to 32a0601 Compare March 27, 2023 03:32
@amyangfei
Copy link
Contributor

/run-all-tests

@amyangfei
Copy link
Contributor

/run-all-tests

@codecov-commenter
Copy link

codecov-commenter commented Mar 27, 2023 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-6.1@d99c02e). Click here to learn what that means.
The diff coverage is n/a.

❗ Current head 66325f1 differs from pull request most recent head d963c5e. Consider uploading reports for the commit d963c5e to get more accurate results

Additional details and impacted files
Flag Coverage Δ
cdc 61.5682% <0.0000%> (?)
dm 55.9955% <0.0000%> (?)
engine 65.3531% <0.0000%> (?)

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

@@               Coverage Diff                @@
##             release-6.1      #8623   +/-   ##
================================================
  Coverage               ?   58.8157%           
================================================
  Files                  ?        817           
  Lines                  ?     108187           
  Branches               ?          0           
================================================
  Hits                   ?      63631           
  Misses                 ?      38855           
  Partials               ?       5701

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: d963c5e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 27, 2023
@amyangfei
Copy link
Contributor

/run-verify
/run-kafka-integration-test

@amyangfei
Copy link
Contributor

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 27, 2023
@ti-chi-bot ti-chi-bot merged commit c9024bf into pingcap:release-6.1 Mar 27, 2023
@asddongmen asddongmen mentioned this pull request Apr 4, 2023
Merged
15 tasks
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels Apr 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amyangfei amyangfei amyangfei left review comments

Assignees

@amyangfei amyangfei

Labels
area/ticdc Issues or PRs related to TiCDC. cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 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. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-chi-bot @amyangfei @codecov-commenter @VelocityLight