Commit 57d9d6c0 authored by Pascal Meunier's avatar Pascal Meunier

DOCKER_MEMORY default to 1G instead of 100M; bug fix for container user and sys time

parent 91b2a1cf
......@@ -2312,8 +2312,10 @@ class ContainerDocker(Container):
if 'DOCKER_MEMORY' in self.k:
args += ['-m', self.k["DOCKER_MEMORY"]]
else:
args += ['-m', '100M']
args += ['-m', '1G']
# swap out idle containers
args += ['--memory-swappiness', '95']
# memory-swap must be >= memory
if 'DOCKER_MEM_SWAP' in self.k:
args += ['--memory-swap', self.k["DOCKER_MEM_SWAP"]]
......@@ -2567,10 +2569,10 @@ class ContainerDocker(Container):
f = open(stats_path)
for line in f:
if line.find('user') != -1:
tool_user_time = int(line.split()[1])
user_time = int(line.split()[1])
continue
if line.find('system') != -1:
tool_system_time = int(line.split()[1])
system_time = int(line.split()[1])
continue
except IOError, exc:
# this can happen if container is already stopped
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment