forked from open-telemetry/opentelemetry-collector-contrib
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Percentage memory limiter settings (#1622)
* Percentage memory limiter Signed-off-by: Pavol Loffay <ploffay@redhat.com> * Some fixes Signed-off-by: Pavol Loffay <ploffay@redhat.com> * Add OTEL license Signed-off-by: Pavol Loffay <ploffay@redhat.com> * Add full OTEL license Signed-off-by: Pavol Loffay <ploffay@redhat.com> * Fix review comments Signed-off-by: Pavol Loffay <ploffay@redhat.com>
- Loading branch information
1 parent
d62f440
commit 4f06a68
Showing
34 changed files
with
1,653 additions
and
31 deletions.
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
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,94 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // 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, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Keep the the original Uber license. | ||
|
|
||
| // Copyright (c) 2017 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| // +build linux | ||
|
|
||
| package cgroups | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "strconv" | ||
| ) | ||
|
|
||
| // CGroup represents the data structure for a Linux control group. | ||
| type CGroup struct { | ||
| path string | ||
| } | ||
|
|
||
| // NewCGroup returns a new *CGroup from a given path. | ||
| func NewCGroup(path string) *CGroup { | ||
| return &CGroup{path: path} | ||
| } | ||
|
|
||
| // Path returns the path of the CGroup*. | ||
| func (cg *CGroup) Path() string { | ||
| return cg.path | ||
| } | ||
|
|
||
| // ParamPath returns the path of the given cgroup param under itself. | ||
| func (cg *CGroup) ParamPath(param string) string { | ||
| return filepath.Join(cg.path, param) | ||
| } | ||
|
|
||
| // readFirstLine reads the first line from a cgroup param file. | ||
| func (cg *CGroup) readFirstLine(param string) (string, error) { | ||
| paramFile, err := os.Open(cg.ParamPath(param)) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| defer paramFile.Close() | ||
|
|
||
| scanner := bufio.NewScanner(paramFile) | ||
| if scanner.Scan() { | ||
| return scanner.Text(), nil | ||
| } | ||
| if err := scanner.Err(); err != nil { | ||
| return "", err | ||
| } | ||
| return "", io.ErrUnexpectedEOF | ||
| } | ||
|
|
||
| // readInt parses the first line from a cgroup param file as int. | ||
| func (cg *CGroup) readInt(param string) (int, error) { | ||
| text, err := cg.readFirstLine(param) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
| return strconv.Atoi(text) | ||
| } |
153 changes: 153 additions & 0 deletions
153
processor/memorylimiter/internal/cgroups/cgroup_test.go
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,153 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // 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, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Keep the the original Uber license. | ||
|
|
||
| // Copyright (c) 2017 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| // +build linux | ||
|
|
||
| package cgroups | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| func TestCGroupParamPath(t *testing.T) { | ||
| cgroup := NewCGroup("/sys/fs/cgroup/cpu") | ||
| assert.Equal(t, "/sys/fs/cgroup/cpu", cgroup.Path()) | ||
| assert.Equal(t, "/sys/fs/cgroup/cpu/cpu.cfs_quota_us", cgroup.ParamPath("cpu.cfs_quota_us")) | ||
| } | ||
|
|
||
| func TestCGroupReadFirstLine(t *testing.T) { | ||
| testTable := []struct { | ||
| name string | ||
| paramName string | ||
| expectedContent string | ||
| shouldHaveError bool | ||
| }{ | ||
| { | ||
| name: "cpu", | ||
| paramName: "cpu.cfs_period_us", | ||
| expectedContent: "100000", | ||
| shouldHaveError: false, | ||
| }, | ||
| { | ||
| name: "absent", | ||
| paramName: "cpu.stat", | ||
| expectedContent: "", | ||
| shouldHaveError: true, | ||
| }, | ||
| { | ||
| name: "empty", | ||
| paramName: "cpu.cfs_quota_us", | ||
| expectedContent: "", | ||
| shouldHaveError: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range testTable { | ||
| cgroupPath := filepath.Join(testDataCGroupsPath, tt.name) | ||
| cgroup := NewCGroup(cgroupPath) | ||
|
|
||
| content, err := cgroup.readFirstLine(tt.paramName) | ||
| assert.Equal(t, tt.expectedContent, content, tt.name) | ||
|
|
||
| if tt.shouldHaveError { | ||
| assert.Error(t, err, tt.name) | ||
| } else { | ||
| assert.NoError(t, err, tt.name) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestCGroupReadInt(t *testing.T) { | ||
| testTable := []struct { | ||
| name string | ||
| paramName string | ||
| expectedValue int | ||
| shouldHaveError bool | ||
| }{ | ||
| { | ||
| name: "cpu", | ||
| paramName: "cpu.cfs_period_us", | ||
| expectedValue: 100000, | ||
| shouldHaveError: false, | ||
| }, | ||
| { | ||
| name: "empty", | ||
| paramName: "cpu.cfs_quota_us", | ||
| expectedValue: 0, | ||
| shouldHaveError: true, | ||
| }, | ||
| { | ||
| name: "invalid", | ||
| paramName: "cpu.cfs_quota_us", | ||
| expectedValue: 0, | ||
| shouldHaveError: true, | ||
| }, | ||
| { | ||
| name: "absent", | ||
| paramName: "cpu.cfs_quota_us", | ||
| expectedValue: 0, | ||
| shouldHaveError: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range testTable { | ||
| cgroupPath := filepath.Join(testDataCGroupsPath, tt.name) | ||
| cgroup := NewCGroup(cgroupPath) | ||
|
|
||
| value, err := cgroup.readInt(tt.paramName) | ||
| assert.Equal(t, tt.expectedValue, value, "%s/%s", tt.name, tt.paramName) | ||
|
|
||
| if tt.shouldHaveError { | ||
| assert.Error(t, err, tt.name) | ||
| } else { | ||
| assert.NoError(t, err, tt.name) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestCGroupMemory(t *testing.T) { | ||
| process, err := NewCGroupsForCurrentProcess() | ||
| require.NoError(t, err) | ||
| quota, b, err := process.MemoryQuota() | ||
| require.True(t, b) | ||
| require.NoError(t, err) | ||
| fmt.Println(quota) | ||
| } |
Oops, something went wrong.