summaryrefslogtreecommitdiffhomepage
path: root/runsc/sandbox
diff options
context:
space:
mode:
Diffstat (limited to 'runsc/sandbox')
-rw-r--r--runsc/sandbox/sandbox.go10
1 files changed, 8 insertions, 2 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go
index cbfb873d1..f6feadf75 100644
--- a/runsc/sandbox/sandbox.go
+++ b/runsc/sandbox/sandbox.go
@@ -637,8 +637,14 @@ func (s *Sandbox) createSandboxProcess(conf *boot.Config, args *Args, startSyncF
if err != nil {
return fmt.Errorf("getting cpu qouta from cgroups: %v", err)
}
- if quota > 0 {
- cpuNum = int(math.Ceil(quota))
+ if n := int(math.Ceil(quota)); n > 0 {
+ if n < conf.CPUNumMin {
+ n = conf.CPUNumMin
+ }
+ if n < cpuNum {
+ // Only lower the cpu number.
+ cpuNum = n
+ }
}
}
cmd.Args = append(cmd.Args, "--cpu-num", strconv.Itoa(cpuNum))