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

cgroup: get right value when cgroup set max value #38661

Merged
merged 11 commits into from
Oct 28, 2022

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Oct 26, 2022

Signed-off-by: Weizhen Wang wangweizhen@pingcap.com

What problem does this PR solve?

Issue Number: close #38664

Problem Summary:

What is changed and how it works?

in the old code, we cannot judge the container when it is in the docker compose.

Check List

Tests

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

test in the docker by @amyangfei

  • 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

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 26, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • amyangfei
  • lance6716

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-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 26, 2022
@hawkingrei
Copy link
Member Author

/run-build

Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 26, 2022
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
Signed-off-by: Weizhen Wang <wangweizhen@pingcap.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 26, 2022
@hawkingrei hawkingrei changed the title cgroup: fix InContainer cgroup: fix InContainer and get right value when cgroup set max value Oct 26, 2022
@wuhuizuo
Copy link
Contributor

/run-all-tests

@lance6716
Copy link
Contributor

Not have much certainty that 0::/ represent it's inside a container.

The entry for cgroup v2 is always in the format “0::$PATH”:

https://docs.kernel.org/admin-guide/cgroup-v2.html

After some searching 0::/ represent "root cgroup", but I'm not sure it means this process is inside a container

@wuhuizuo
Copy link
Contributor

/run-all-tests

@lance6716
Copy link
Contributor

lance6716 commented Oct 26, 2022

in my PC

image

/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 Oct 26, 2022
@amyangfei
Copy link
Contributor

amyangfei commented Oct 26, 2022

Not have much certainty that 0::/ represent it's inside a container.

The entry for cgroup v2 is always in the format “0::$PATH”:

https://docs.kernel.org/admin-guide/cgroup-v2.html

After some searching 0::/ represent "root cgroup", but I'm not sure it means this process is inside a container

It depends on the cgroup hierarchy, maybe it is better to check whether cgroup is enabled for the current process instead of checking whether it is running in a container.

@lance6716
Copy link
Contributor

if cgroup is enabled, we use memory limit from cgroup, otherwise we use memory limit of physical machine

@hawkingrei
Copy link
Member Author

@lance6716 fix the wrong handling when cgroup is set as the max value.

@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 Oct 27, 2022
@hawkingrei
Copy link
Member Author

/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 Oct 28, 2022
@hawkingrei
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: cb6c759

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 28, 2022
@lance6716 lance6716 changed the title cgroup: fix InContainer and get right value when cgroup set max value cgroup: get right value when cgroup set max value Oct 28, 2022
@hawkingrei
Copy link
Member Author

/run-all-tests

@ti-chi-bot ti-chi-bot merged commit 1614991 into pingcap:master Oct 28, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Oct 28, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-common-test 🟥 1 min 54 sec New failing
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 1, success 5, total 6 30 min Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 38 tests passed 25 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 18 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 7 min 3 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 2 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 34 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 54 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 51 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@hawkingrei hawkingrei deleted the fix_in_container branch February 13, 2023 10:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 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
Development

Successfully merging this pull request may close these issues.

get wrong mem limit/usage when cgroup memory set max
6 participants