add mlab patch to add tasks to cpuacct cgroup, put os.environ before os.execv
smbaker [Tue, 18 Dec 2012 06:36:41 +0000 (22:36 -0800)]
lxcsu [changed mode: 0644->0755]

diff --git a/lxcsu b/lxcsu
old mode 100644 (file)
new mode 100755 (executable)
index c076506..dc24ec1
--- a/lxcsu
+++ b/lxcsu
@@ -69,6 +69,12 @@ except:
     print "Error assigning resources: %s"%slice_name
     exit(1)
 
+try:
+    open('/sys/fs/cgroup/cpuacct/system/libvirtd.service/libvirt/lxc/%s/tasks'%slice_name,'w').write(str(os.getpid()))
+except:
+    print "Error assigning cpuacct: %s" % slice_name
+    exit(1)
+
 # If the slice is frozen, then we'll get an EBUSY when trying to write to the task
 # list for the freezer cgroup. Since the user couldn't do anything anyway, it's best
 # in this case to error out the shell. (an alternative would be to un-freeze it,
@@ -95,7 +101,7 @@ pid = os.fork()
 cap_args = map(lambda c:'--drop='+c, drop_capabilities)
     
 if (pid == 0):
-    os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
     os.environ['SHELL'] = '/bin/sh'
+    os.execv('/usr/sbin/capsh',cap_args+['--','--login']+args[1:])
 else:
     os.waitpid(pid,0)