diff options
| author | Toshiki Sonoda <sonoda.toshiki@fujitsu.com> | 2022-09-09 16:21:06 +0900 |
|---|---|---|
| committer | Toshiki Sonoda <sonoda.toshiki@fujitsu.com> | 2022-09-09 17:33:43 +0900 |
| commit | c7411af9e2f2f38beb48d07a401cb06dc8d9b328 (patch) | |
| tree | ebe42972ab62148f3f55f29fafd23f18738ace25 /pkg | |
| parent | 6d8bafe57a65970ead17a83cb1983629b3a2aedb (diff) | |
| download | podman-c7411af9e2f2f38beb48d07a401cb06dc8d9b328.tar.gz podman-c7411af9e2f2f38beb48d07a401cb06dc8d9b328.tar.bz2 podman-c7411af9e2f2f38beb48d07a401cb06dc8d9b328.zip | |
Ignore cpu realtime options on cgroups V2 systems
`--cpu-rt-period` and `--cpu-rt-runtime` options are only
supported on cgroups V1 rootful systems.
Therefore, podman prints an warning message and ignores these
options when we use cgroups V2 systems.
Related to: #15666
Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgen/generate/validate.go | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkg/specgen/generate/validate.go b/pkg/specgen/generate/validate.go index 3c5d5fb96..e9ebdfce3 100644 --- a/pkg/specgen/generate/validate.go +++ b/pkg/specgen/generate/validate.go @@ -82,7 +82,7 @@ func verifyContainerResourcesCgroupV1(s *specgen.SpecGenerator) ([]string, error } } - // CPU Checks + // CPU checks if s.ResourceLimits.CPU != nil { cpu := s.ResourceLimits.CPU if cpu.Shares != nil && !sysInfo.CPUShares { @@ -169,6 +169,7 @@ func verifyContainerResourcesCgroupV2(s *specgen.SpecGenerator) ([]string, error return warnings, nil } + // Memory checks if s.ResourceLimits.Memory != nil && s.ResourceLimits.Memory.Swap != nil { own, err := utils.GetOwnCgroup() if err != nil { @@ -198,6 +199,19 @@ func verifyContainerResourcesCgroupV2(s *specgen.SpecGenerator) ([]string, error s.ResourceLimits.Memory.Swap = nil } } + + // CPU checks + if s.ResourceLimits.CPU != nil { + cpu := s.ResourceLimits.CPU + if cpu.RealtimePeriod != nil { + warnings = append(warnings, "Realtime period not supported on cgroups V2 systems") + cpu.RealtimePeriod = nil + } + if cpu.RealtimeRuntime != nil { + warnings = append(warnings, "Realtime runtime not supported on cgroups V2 systems") + cpu.RealtimeRuntime = nil + } + } return warnings, nil } |