github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Passing memory swap limit -1 by default. Docker remote API never check if memory

Browse Source 
swap is enabled by kernel or not, instead by default to set the limit to
memory * 2, and return API error 500 if swap is not enabled.

(cherry picked from commit f714020a7a)
This commit is contained in:
Dawn Chen 2015-06-05 18:12:05 -07:00 committed by Brendan Burns
parent 3e5707be5b
commit a90d47da60
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/dockertools/manager.go
View File

@ -584,6 +584,7 @@ func (dm *DockerManager) runContainer(
Image: container.Image, Image: container.Image,
// Memory and CPU are set here for older versions of Docker (pre-1.6). // Memory and CPU are set here for older versions of Docker (pre-1.6).
Memory: memoryLimit, Memory: memoryLimit,
MemorySwap: -1,
CPUShares: cpuShares, CPUShares: cpuShares,
WorkingDir: container.WorkingDir, WorkingDir: container.WorkingDir,
Labels: labels, Labels: labels,
@ -634,8 +635,9 @@ func (dm *DockerManager) runContainer(
NetworkMode: netMode, NetworkMode: netMode,
IpcMode: ipcMode, IpcMode: ipcMode,
// Memory and CPU are set here for newer versions of Docker (1.6+). // Memory and CPU are set here for newer versions of Docker (1.6+).
Memory: memoryLimit, Memory: memoryLimit,
CPUShares: cpuShares, MemorySwap: -1,
CPUShares: cpuShares,
} }
if len(opts.DNS) > 0 { if len(opts.DNS) > 0 {
hc.DNS = opts.DNS hc.DNS = opts.DNS