Merge pull request #7914 from owncloud/dependabot/go_modules/github.com/KimMachineGun/automemlimit-0.4.0

build(deps): bump github.com/KimMachineGun/automemlimit from 0.3.0 to 0.4.0

go.mod

@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/CiscoM31/godata v1.0.9
-	github.com/KimMachineGun/automemlimit v0.3.0
+	github.com/KimMachineGun/automemlimit v0.4.0
 	github.com/Masterminds/semver v1.5.0
 	github.com/MicahParks/keyfunc v1.9.0
 	github.com/Nerzal/gocloak/v13 v13.8.0

go.sum

@@ -797,8 +797,8 @@ github.com/CiscoM31/godata v1.0.9 h1:7ovi2efjWb6RloX96AJqBB9eyIfBdarzj8kzg7glPC4
 github.com/CiscoM31/godata v1.0.9/go.mod h1:ZMiT6JuD3Rm83HEtiTx4JEChsd25YCrxchKGag/sdTc=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
-github.com/KimMachineGun/automemlimit v0.3.0 h1:khgwM5ESVN85cE6Bq2ozMAAWDfrOEwQ51D/YlmThE04=
-github.com/KimMachineGun/automemlimit v0.3.0/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0=
+github.com/KimMachineGun/automemlimit v0.4.0 h1:qOjSDbAUENEL6fiKmRKuAVhPaLijpoEHFDTE+I+prp0=
+github.com/KimMachineGun/automemlimit v0.4.0/go.mod h1:pJhTW/nWJMj6SnWSU2TEKSlCaM+1N5Mej+IfS/5/Ol0=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=

vendor/github.com/KimMachineGun/automemlimit/README.md

@@ -42,6 +42,7 @@ func init() {
 	memlimit.SetGoMemLimitWithProvider(memlimit.Limit(1024*1024), 0.9)
 	memlimit.SetGoMemLimitWithProvider(memlimit.FromCgroup, 0.9)
 	memlimit.SetGoMemLimitWithProvider(memlimit.FromCgroupV1, 0.9)
+	memlimit.SetGoMemLimitWithProvider(memlimit.FromCgroupHybrid, 0.9)
 	memlimit.SetGoMemLimitWithProvider(memlimit.FromCgroupV2, 0.9)
 }
 ```

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

vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups_unsupported.go

@@ -11,7 +11,7 @@ func FromCgroupV1() (uint64, error) {
 	return 0, ErrCgroupsNotSupported
 }
 
-func fromCgroupHybrid() (uint64, error) {
+func FromCgroupHybrid() (uint64, error) {
 	return 0, ErrCgroupsNotSupported
 }
 

vendor/github.com/KimMachineGun/automemlimit/memlimit/memlimit.go

@@ -104,14 +104,14 @@ func SetGoMemLimitWithOpts(opts ...Option) (_ int64, _err error) {
 
 	if val, ok := os.LookupEnv(envGOMEMLIMIT); ok {
 		cfg.logger.Printf("GOMEMLIMIT is set already, skipping: %s\n", val)
-		return
+		return 0, nil
 	}
 
 	ratio := cfg.ratio
 	if val, ok := os.LookupEnv(envAUTOMEMLIMIT); ok {
 		if val == "off" {
 			cfg.logger.Printf("AUTOMEMLIMIT is set to off, skipping\n")
-			return
+			return 0, nil
 		}
 		_ratio, err := strconv.ParseFloat(val, 64)
 		if err != nil {
@@ -119,11 +119,8 @@ func SetGoMemLimitWithOpts(opts ...Option) (_ int64, _err error) {
 		}
 		ratio = _ratio
 	}
-	if ratio <= 0 || ratio > 1 {
-		return 0, fmt.Errorf("invalid AUTOMEMLIMIT: %f", ratio)
-	}
 
-	limit, err := SetGoMemLimitWithProvider(cfg.provider, ratio)
+	limit, err := setGoMemLimit(ApplyRatio(cfg.provider, ratio))
 	if err != nil {
 		return 0, fmt.Errorf("failed to set GOMEMLIMIT: %w", err)
 	}
@@ -145,33 +142,27 @@ func SetGoMemLimitWithEnv() {
 
 // SetGoMemLimit sets GOMEMLIMIT with the value from the cgroup's memory limit and given ratio.
 func SetGoMemLimit(ratio float64) (int64, error) {
-	return SetGoMemLimitWithProvider(FromCgroup, ratio)
+	return SetGoMemLimitWithOpts(WithRatio(ratio))
 }
 
-// Provider is a function that returns the memory limit.
-type Provider func() (uint64, error)
-
 // SetGoMemLimitWithProvider sets GOMEMLIMIT with the value from the given provider and ratio.
 func SetGoMemLimitWithProvider(provider Provider, ratio float64) (int64, error) {
+	return SetGoMemLimitWithOpts(WithProvider(provider), WithRatio(ratio))
+}
+
+func setGoMemLimit(provider Provider) (int64, error) {
 	limit, err := provider()
 	if err != nil {
 		return 0, err
 	}
-	goMemLimit := cappedFloat2Int(float64(limit) * ratio)
-	debug.SetMemoryLimit(goMemLimit)
-	return goMemLimit, nil
+	capped := cappedU64ToI64(limit)
+	debug.SetMemoryLimit(capped)
+	return capped, nil
 }
 
-func cappedFloat2Int(f float64) int64 {
-	if f > math.MaxInt64 {
+func cappedU64ToI64(limit uint64) int64 {
+	if limit > math.MaxInt64 {
 		return math.MaxInt64
 	}
-	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) {
-		return limit, nil
-	}
+	return int64(limit)
 }

vendor/github.com/KimMachineGun/automemlimit/memlimit/provider.go

@@ -0,0 +1,40 @@
+package memlimit
+
+import (
+	"fmt"
+)
+
+// Provider is a function that returns the memory limit.
+type Provider func() (uint64, error)
+
+// Limit is a helper Provider function that returns the given limit.
+func Limit(limit uint64) func() (uint64, error) {
+	return func() (uint64, error) {
+		return limit, nil
+	}
+}
+
+// ApplyRationA is a helper Provider function that applies the given ratio to the given provider.
+func ApplyRatio(provider Provider, ratio float64) Provider {
+	return func() (uint64, error) {
+		if ratio <= 0 || ratio > 1 {
+			return 0, fmt.Errorf("invalid ratio: %f, ratio should be in the range (0.0,1.0]", ratio)
+		}
+		limit, err := provider()
+		if err != nil {
+			return 0, err
+		}
+		return uint64(float64(limit) * ratio), nil
+	}
+}
+
+// ApplyFallback is a helper Provider function that sets the fallback provider.
+func ApplyFallback(provider Provider, fallback Provider) Provider {
+	return func() (uint64, error) {
+		limit, err := provider()
+		if err != nil {
+			return fallback()
+		}
+		return limit, nil
+	}
+}

vendor/modules.txt

@@ -11,7 +11,7 @@ github.com/BurntSushi/toml/internal
 # github.com/CiscoM31/godata v1.0.9
 ## explicit; go 1.19
 github.com/CiscoM31/godata
-# github.com/KimMachineGun/automemlimit v0.3.0
+# github.com/KimMachineGun/automemlimit v0.4.0
 ## explicit; go 1.19
 github.com/KimMachineGun/automemlimit
 github.com/KimMachineGun/automemlimit/memlimit