mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-05-05 14:43:30 -04:00
Bump github.com/KimMachineGun/automemlimit from 0.2.4 to 0.2.6
Bumps [github.com/KimMachineGun/automemlimit](https://github.com/KimMachineGun/automemlimit) from 0.2.4 to 0.2.6. - [Commits](https://github.com/KimMachineGun/automemlimit/compare/v0.2.4...v0.2.6) --- updated-dependencies: - dependency-name: github.com/KimMachineGun/automemlimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
committed by
Ralf Haferkamp
parent
5f8750cfac
commit
d656b4ad19
55
vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go
generated
vendored
55
vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go
generated
vendored
@@ -4,8 +4,11 @@
|
||||
package memlimit
|
||||
|
||||
import (
|
||||
"github.com/containerd/cgroups"
|
||||
v2 "github.com/containerd/cgroups/v2"
|
||||
"path/filepath"
|
||||
|
||||
"github.com/containerd/cgroups/v3"
|
||||
"github.com/containerd/cgroups/v3/cgroup1"
|
||||
"github.com/containerd/cgroups/v3/cgroup2"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -17,7 +20,9 @@ func FromCgroup() (uint64, error) {
|
||||
switch cgroups.Mode() {
|
||||
case cgroups.Legacy:
|
||||
return FromCgroupV1()
|
||||
case cgroups.Hybrid, cgroups.Unified:
|
||||
case cgroups.Hybrid:
|
||||
return fromCgroupHybrid()
|
||||
case cgroups.Unified:
|
||||
return FromCgroupV2()
|
||||
}
|
||||
return 0, ErrNoCgroup
|
||||
@@ -25,29 +30,51 @@ func FromCgroup() (uint64, error) {
|
||||
|
||||
// FromCgroupV1 returns the memory limit from the cgroup v1.
|
||||
func FromCgroupV1() (uint64, error) {
|
||||
cg, err := cgroups.Load(cgroups.SingleSubsystem(cgroups.V1, cgroups.Memory), cgroups.RootPath)
|
||||
cg, err := cgroup1.Load(cgroup1.RootPath, cgroup1.WithHiearchy(
|
||||
cgroup1.SingleSubsystem(cgroup1.Default, cgroup1.Memory),
|
||||
))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
metrics, err := cg.Stat(cgroups.IgnoreNotExist)
|
||||
metrics, err := cg.Stat(cgroup1.IgnoreNotExist)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
} else if metrics.Memory == nil {
|
||||
return 0, ErrNoLimit
|
||||
}
|
||||
|
||||
return metrics.Memory.HierarchicalMemoryLimit, nil
|
||||
if limit := metrics.GetMemory().GetHierarchicalMemoryLimit(); limit != 0 {
|
||||
return limit, nil
|
||||
}
|
||||
|
||||
return 0, ErrNoLimit
|
||||
}
|
||||
|
||||
// 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) {
|
||||
limit, err := fromCgroupV2(filepath.Join(cgroupMountPoint, "unified"))
|
||||
if err == nil {
|
||||
return limit, nil
|
||||
} else if err != ErrNoLimit {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
return FromCgroupV1()
|
||||
}
|
||||
|
||||
// FromCgroupV2 returns the memory limit from the cgroup v2.
|
||||
func FromCgroupV2() (uint64, error) {
|
||||
path, err := v2.NestedGroupPath("")
|
||||
return fromCgroupV2(cgroupMountPoint)
|
||||
}
|
||||
|
||||
func fromCgroupV2(mountPoint string) (uint64, error) {
|
||||
path, err := cgroup2.NestedGroupPath("")
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
|
||||
m, err := v2.LoadManager(cgroupMountPoint, path)
|
||||
m, err := cgroup2.Load(path, cgroup2.WithMountpoint(mountPoint))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
@@ -55,9 +82,11 @@ func FromCgroupV2() (uint64, error) {
|
||||
stats, err := m.Stat()
|
||||
if err != nil {
|
||||
return 0, err
|
||||
} else if stats.Memory == nil {
|
||||
return 0, ErrNoLimit
|
||||
}
|
||||
|
||||
return stats.Memory.UsageLimit, nil
|
||||
if limit := stats.GetMemory().GetUsageLimit(); limit != 0 {
|
||||
return limit, nil
|
||||
}
|
||||
|
||||
return 0, ErrNoLimit
|
||||
}
|
||||
|
||||
4
vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups_unsupported.go
generated
vendored
4
vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups_unsupported.go
generated
vendored
@@ -11,6 +11,10 @@ func FromCgroupV1() (uint64, error) {
|
||||
return 0, ErrCgroupsNotSupported
|
||||
}
|
||||
|
||||
func fromCgroupHybrid() (uint64, error) {
|
||||
return 0, ErrCgroupsNotSupported
|
||||
}
|
||||
|
||||
func FromCgroupV2() (uint64, error) {
|
||||
return 0, ErrCgroupsNotSupported
|
||||
}
|
||||
|
||||
10
vendor/github.com/KimMachineGun/automemlimit/memlimit/memlimit.go
generated
vendored
10
vendor/github.com/KimMachineGun/automemlimit/memlimit/memlimit.go
generated
vendored
@@ -36,6 +36,15 @@ var (
|
||||
// If AUTOMEMLIMIT is not set, it defaults to 0.9. (10% is the headroom for memory sources the Go runtime is unaware of.)
|
||||
// If GOMEMLIMIT is already set or AUTOMEMLIMIT=off, this function does nothing.
|
||||
func SetGoMemLimitWithEnv() {
|
||||
snapshot := debug.SetMemoryLimit(-1)
|
||||
defer func() {
|
||||
err := recover()
|
||||
if err != nil {
|
||||
logger.Printf("panic during SetGoMemLimitWithEnv, rolling back to previous value %d: %v\n", snapshot, err)
|
||||
debug.SetMemoryLimit(snapshot)
|
||||
}
|
||||
}()
|
||||
|
||||
if os.Getenv(envAUTOMEMLIMIT_DEBUG) == "true" {
|
||||
logger = log.Default()
|
||||
}
|
||||
@@ -97,6 +106,7 @@ func cappedFloat2Int(f float64) int64 {
|
||||
}
|
||||
return int64(f)
|
||||
}
|
||||
|
||||
// Limit is a helper Provider function that returns the given limit.
|
||||
func Limit(limit uint64) func() (uint64, error) {
|
||||
return func() (uint64, error) {
|
||||
|
||||
Reference in New Issue
Block a user