faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-08 16:06:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change readMemoryLimitFromSpec, to a more clear implementation, edited error message.

Browse Source 
Signed-off-by: Shikachuu <zcmate@gmail.com>
This commit is contained in:
Shikachuu 2021-09-20 21:05:01 +02:00 committed by Alex Ellis
parent c5f167df21
commit 0c0088e8b0
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/provider/handlers/functions.go
View File

@ -93,7 +93,7 @@ func GetFunction(client *containerd.Client, name string, namespace string) (Func
spec, err := c.Spec(ctx) spec, err := c.Spec(ctx)
if err != nil { if err != nil {
return Function{}, fmt.Errorf("unable to load function spec for reading secrets and limits: %s, error %w", name, err) return Function{}, fmt.Errorf("unable to load function %s error: %w", name, err)
} }
info, err := c.Info(ctx) info, err := c.Info(ctx)
@ -235,16 +235,7 @@ func findNamespace(target string, items []string) bool {
} }
func readMemoryLimitFromSpec(spec *specs.Spec) int64 { func readMemoryLimitFromSpec(spec *specs.Spec) int64 {
if spec.Linux != nil { if spec.Linux == nil || spec.Linux.Resources == nil || spec.Linux.Resources.Memory == nil || spec.Linux.Resources.Memory.Limit == nil {
return 0
}
if spec.Linux.Resources == nil {
return 0
}
if spec.Linux.Resources.Memory == nil {
return 0
}
if spec.Linux.Resources.Memory.Limit == nil {
return 0 return 0
} }
return *spec.Linux.Resources.Memory.Limit return *spec.Linux.Resources.Memory.Limit