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

Merged
merged 11 commits into from
Mar 22, 2023
Merged

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

merged 11 commits into from
Mar 22, 2023

Conversation

amyangfei
Copy link
Contributor

@amyangfei amyangfei commented Mar 20, 2023 •
edited
Loading

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 sorter engine under some scenarios.

@amyangfei
sorter(ticdc): use correct cgroup memory limit in some scenarios
1056d3d 
- Fix unawareness of systemd cgroup scenario
@amyangfei amyangfei added the area/ticdc Issues or PRs related to TiCDC. label Mar 20, 2023
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 20, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CharlesCheung96
  • hicqu

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 needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 20, 2023
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 20, 2023
@amyangfei amyangfei added the status/ptal Could you please take a look? label Mar 20, 2023
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 20, 2023
CharlesCheung96
CharlesCheung96 reviewed Mar 20, 2023
View reviewed changes
pkg/util/memory.go
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe memory_checker.go and memory.go should be merged?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

merge them into memory.go.

@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.0 Should cherry pick this PR to release-7.0 branch. label Mar 20, 2023
@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei
Copy link
Contributor Author

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

@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 Mar 20, 2023
@CharlesCheung96
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: d3f396f

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

/run-dm-integration-test
/run-kafka-integration-test
/run-engine-integration-test

@amyangfei
Copy link
Contributor Author

/merge

@amyangfei
Copy link
Contributor Author

/run-all-tests

@amyangfei
Copy link
Contributor Author

/run-verify

@amyangfei
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link
Member

@amyangfei: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

trigger some heavy tests which will not run always when PR updated.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

@amyangfei
Copy link
Contributor Author

/run-kafka-integration-test

1 similar comment
@amyangfei
Copy link
Contributor Author

/run-kafka-integration-test

@amyangfei amyangfei merged commit 7dc2617 into pingcap:master Mar 22, 2023
@amyangfei amyangfei deleted the fix-sorter-mem-limit branch March 22, 2023 01:59
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 22, 2023
Merged
6 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Mar 22, 2023
@amyangfei @ti-chi-bot
This is an automated cherry-pick of pingcap#8589
23f4447 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 22, 2023
Merged
6 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Mar 22, 2023
@amyangfei @ti-chi-bot
This is an automated cherry-pick of pingcap#8589
010c99f 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 22, 2023
Closed
6 tasks
@ti-chi-bot
Copy link
Member

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

@amyangfei amyangfei mentioned this pull request Mar 24, 2023
Closed
2 tasks
amyangfei added a commit to amyangfei/tiflow that referenced this pull request Mar 27, 2023
@amyangfei
sorter(ticdc): use correct cgroup memory limit in some scenarios (pin…
ee00170 
…gcap#8589)
amyangfei added a commit to amyangfei/tiflow that referenced this pull request Mar 27, 2023
@amyangfei
sorter(ticdc): use correct cgroup memory limit in some scenarios (pin…
f20804b 
…gcap#8589)
amyangfei added a commit to ti-chi-bot/tiflow that referenced this pull request Mar 27, 2023
@amyangfei
sorter(ticdc): use correct cgroup memory limit in some scenarios (pin…
435e811 
…gcap#8589)
ti-chi-bot added a commit that referenced this pull request Mar 27, 2023
@ti-chi-bot
sorter(ticdc): use correct cgroup memory limit in some scenarios (#8589…
c9024bf 
…) (#8623)

close #8588
3AceShowHand pushed a commit to 3AceShowHand/tiflow that referenced this pull request Apr 3, 2023
@amyangfei @3AceShowHand
sorter(ticdc): use correct cgroup memory limit in some scenarios (pin…
48843e7 
…gcap#8589)
ti-chi-bot added a commit that referenced this pull request Apr 3, 2023
@ti-chi-bot
sorter(ticdc): use correct cgroup memory limit in some scenarios (#8589…
672e286 
…) (#8624)

close #8588
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CharlesCheung96 CharlesCheung96 CharlesCheung96 approved these changes

@hicqu hicqu hicqu approved these changes

@Rustin170506 Rustin170506 Awaiting requested review from Rustin170506

Assignees
No one assigned
Labels
area/ticdc Issues or PRs related to TiCDC. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.0 Should cherry pick this PR to release-7.0 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. status/ptal Could you please take a look?
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cgroup memory limit is not awared in some scenarios
4 participants
@amyangfei @ti-chi-bot @CharlesCheung96 @hicqu