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

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

Merged
merged 11 commits into from
Oct 28, 2022
Merged

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

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0f5d466
cgroup: fix InContainer
hawkingrei Oct 26, 2022
14d6fa7
cgroup: fix InContainer
hawkingrei Oct 26, 2022
c0c6994
cgroup: fix InContainer
hawkingrei Oct 26, 2022
23c1f22
cgroup: fix InContainer
hawkingrei Oct 26, 2022
261803f
cgroup: fix InContainer
hawkingrei Oct 26, 2022
cb6c759
u
hawkingrei Oct 27, 2022
3dc67e7
Merge branch 'master' into fix_in_container
ti-chi-bot Oct 28, 2022
d45a5d2
Merge branch 'master' into fix_in_container
ti-chi-bot Oct 28, 2022
1124e5c
Merge branch 'master' into fix_in_container
ti-chi-bot Oct 28, 2022
5d942e0
Merge branch 'master' into fix_in_container
ti-chi-bot Oct 28, 2022
4f58f7d
Merge branch 'master' into fix_in_container
ti-chi-bot Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions util/memory/meminfo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

"github.com/pingcap/tidb/parser/terror"
"github.com/pingcap/tidb/util/cgroup"
"github.com/pingcap/tidb/util/mathutil"
"github.com/shirou/gopsutil/v3/mem"
)

Expand Down Expand Up @@ -105,6 +106,11 @@ func MemTotalCGroup() (uint64, error) {
if err != nil {
return memo, err
}
v, err := mem.VirtualMemory()
if err != nil {
return 0, err
}
memo = mathutil.Min(v.Total, memo)
memLimit.set(memo, time.Now())
return memo, nil
}
Expand All @@ -119,6 +125,11 @@ func MemUsedCGroup() (uint64, error) {
if err != nil {
return memo, err
}
v, err := mem.VirtualMemory()
if err != nil {
return 0, err
}
memo = mathutil.Min(v.Used, memo)
memUsage.set(memo, time.Now())
return memo, nil
}
Expand Down