Merge pull request #170 from piyushs/cgroup-fix

Fix issue with mountCgroups not recognizing mounted cgroup
This commit is contained in:
Brian O'Connor
2013-07-19 16:04:48 -07:00
+4 -4
View File
@@ -363,13 +363,13 @@ def fixLimits():
def mountCgroups(): def mountCgroups():
"Make sure cgroups file system is mounted" "Make sure cgroups file system is mounted"
mounts = quietRun( 'mount' ) mounts = quietRun( 'cat /proc/mounts' )
cgdir = '/sys/fs/cgroup' cgdir = '/sys/fs/cgroup'
csdir = cgdir + '/cpuset' csdir = cgdir + '/cpuset'
if ('cgroup on %s' % cgdir not in mounts and if ('cgroup %s' % cgdir not in mounts and
'cgroups on %s' % cgdir not in mounts): 'cgroups %s' % cgdir not in mounts):
raise Exception( "cgroups not mounted on " + cgdir ) raise Exception( "cgroups not mounted on " + cgdir )
if 'cpuset on %s' % csdir not in mounts: if 'cpuset %s' % csdir not in mounts:
errRun( 'mkdir -p ' + csdir ) errRun( 'mkdir -p ' + csdir )
errRun( 'mount -t cgroup -ocpuset cpuset ' + csdir ) errRun( 'mount -t cgroup -ocpuset cpuset ' + csdir )