Skip to content

[1.0.0.rc1] validation: add linux resource check #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2016
Merged

[1.0.0.rc1] validation: add linux resource check #198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions cmd/ocitools/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,11 @@ func checkLinux(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string)
}
}

if spec.Linux.Resources != nil {
ms := checkLinuxResources(*spec.Linux.Resources, hostCheck)
msgs = append(msgs, ms...)
}

if spec.Linux.Seccomp != nil {
ms := checkSeccomp(*spec.Linux.Seccomp)
msgs = append(msgs, ms...)
Expand All @@ -381,6 +386,21 @@ func checkLinux(spec rspec.Spec, rootfs string, hostCheck bool) (msgs []string)
return
}

func checkLinuxResources(r rspec.Resources, hostCheck bool) (msgs []string) {
logrus.Debugf("check linux resources")

if r.Memory != nil {
if r.Memory.Limit != nil && r.Memory.Swap != nil && uint64(*r.Memory.Limit) > uint64(*r.Memory.Swap) {
msgs = append(msgs, fmt.Sprintf("Minimum memoryswap should be larger than memory limit"))
}
if r.Memory.Limit != nil && r.Memory.Reservation != nil && uint64(*r.Memory.Reservation) > uint64(*r.Memory.Limit) {
msgs = append(msgs, fmt.Sprintf("Minimum memory limit should be larger than memory reservation"))
}
}

return
}

func checkSeccomp(s rspec.Seccomp) (msgs []string) {
logrus.Debugf("check seccomp")

Expand Down