Merge pull request #41 from solidsnack/master

Fix issue with CGroups on CentOS
mesosphere-backup · Jul 17, 2014 · bf3a836 · bf3a836
2 parents 7074ce3 + 0d792d3
commit bf3a836
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/deimos/containerizer/__init__.py b/deimos/containerizer/__init__.py
@@ -2,6 +2,7 @@
 import logging
 import os
 import re
+import subprocess
 
 try:                  # Prefer system installation of Mesos protos if available
     from mesos_pb2 import *

diff --git a/deimos/docker.py b/deimos/docker.py
@@ -108,7 +108,10 @@ def cgroups(cid):
     paths = []
     paths += glob.glob("/sys/fs/cgroup/*/" + cid)
     paths += glob.glob("/sys/fs/cgroup/*/docker/" + cid)
-    return dict((s.split("/")[4], s) for s in paths)
+    paths += glob.glob("/cgroup/*/" + cid)
+    paths += glob.glob("/cgroup/*/docker/" + cid)
+    named_cgroups = [(s.split("/cgroup/")[1].split("/")[0], s) for s in paths]
+    return dict(named_cgroups)
 
 
 def matching_image_for_host(distro=None, release=None, *args, **kwargs):