-
Notifications
You must be signed in to change notification settings - Fork 287
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
sorter(ticdc): use correct cgroup memory limit in some scenarios #8589
Merged
Merged
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
1056d3d
sorter(ticdc): use correct cgroup memory limit in some scenarios
amyangfei 4ca58ef
add memory abstraction in util package
amyangfei 73b95fa
update comment
amyangfei fec9796
merge two related files
amyangfei d3f396f
Merge branch 'master' into fix-sorter-mem-limit
amyangfei f3e69c0
Merge branch 'master' into fix-sorter-mem-limit
ti-chi-bot ee1d1c0
Merge branch 'master' into fix-sorter-mem-limit
ti-chi-bot e103140
Merge branch 'master' into fix-sorter-mem-limit
ti-chi-bot 013420f
Merge branch 'master' into fix-sorter-mem-limit
ti-chi-bot b542783
Merge branch 'master' into fix-sorter-mem-limit
ti-chi-bot cda6809
Merge branch 'master' into fix-sorter-mem-limit
ti-chi-bot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| // Copyright 2023 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "math" | ||
|
|
||
| "github.com/KimMachineGun/automemlimit/memlimit" | ||
| "github.com/pingcap/errors" | ||
| "github.com/pingcap/log" | ||
| "github.com/pingcap/tidb/util/memory" | ||
| "go.uber.org/zap" | ||
| ) | ||
|
|
||
| const memoryMax uint64 = math.MaxUint64 | ||
|
|
||
| // GetMemoryLimit gets the memory limit of current process based on cgroup. | ||
| // If the cgourp is not set or memory.max is set to max, returns the available | ||
| // memory of host. | ||
| func GetMemoryLimit() (uint64, error) { | ||
| totalMemory, err := memlimit.FromCgroup() | ||
| if err != nil || totalMemory == memoryMax { | ||
| log.Info("no cgroup memory limit", zap.Error(err)) | ||
| totalMemory, err = memory.MemTotal() | ||
| if err != nil { | ||
| return 0, errors.Trace(err) | ||
| } | ||
| } | ||
| return totalMemory, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // Copyright 2023 PingCAP, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package util | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestGetMemoryLimit(t *testing.T) { | ||
| t.Parallel() | ||
| limit, err := GetMemoryLimit() | ||
| require.NoError(t, err) | ||
| require.Less(t, limit, memoryMax) | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe
memory_checker.goandmemory.goshould be merged?There was a problem hiding this comment.
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.