summaryrefslogtreecommitdiff
path: root/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go')
-rw-r--r--vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go7
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go b/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go
index a5c22de32..cfe6d0f60 100644
--- a/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go
+++ b/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go
@@ -21,7 +21,7 @@ func FromCgroup() (uint64, error) {
case cgroups.Legacy:
return FromCgroupV1()
case cgroups.Hybrid:
- return fromCgroupHybrid()
+ return FromCgroupHybrid()
case cgroups.Unified:
return FromCgroupV2()
}
@@ -49,10 +49,9 @@ func FromCgroupV1() (uint64, error) {
return 0, ErrNoLimit
}
-// fromCgroupHybrid returns the memory limit from the cgroup v1 or v2.
+// FromCgroupHybrid returns the memory limit from the cgroup v1 or v2.
// It checks the cgroup v2 first, and if it fails, it falls back to cgroup v1.
-// TODO: make this function public in the next minor version.
-func fromCgroupHybrid() (uint64, error) {
+func FromCgroupHybrid() (uint64, error) {
limit, err := fromCgroupV2(filepath.Join(cgroupMountPoint, "unified"))
if err == nil {
return limit, nil