Merge pull request #738 from ec-m/ec-m_lxc-ls

Fix swap calculation (#737)
This commit is contained in:
Serge Hallyn 2015-12-23 14:36:23 -08:00
commit 364d54c9f0

View File

@ -311,8 +311,10 @@ def get_containers(fd=None, base="/", root=False):
memory_ram = 0
try:
memory_swap = int(container.get_cgroup_item(
"memory.memsw.usage_in_bytes")) - memory_ram
memory_stat = container.get_cgroup_item("memory.stat")
beg = memory_stat.find("\nswap ") + 6
end = memory_stat[beg:].find("\n") + len(memory_stat[:beg])
memory_swap = int(memory_stat[beg:end])
except:
memory_swap = 0
else: