Merge lp:~jamesodhunt/ubuntu/utopic/cgmanager/enable-upstart-cgroup-support into lp:ubuntu/utopic/cgmanager

[James Hunt]

Upstart 1.13 now includes cgroup support. However, it is not enabled until init is notified that the cgmanager is running by invoking 'initctl notify-cgroup-manager-address'.

This MP makes that call once the cgmanager is running.

XXX: Note the '|| true' which is to avoid a circular dependency by making cgmanager depend on 'upstart (>= 1.13)' (since upstart already indirectly depends on cgmanager via the libcgmanager-dev build-dep. The '|| true' therefore will attempt to enable cgroup support of the version of upstart running supports it, but not fail if it doesn't.

Assigned to xnox as result of Foundations meeting on #ubuntu-meeting today as we wish to delay the upload for a few days:

<snip>
6:25:15 <xnox> jodh: and i'd want to land that when it's relatively quite in the archive, It's not at the moment. Maybe later on friday and/or over the weekend - monday time.

6:26:28 <jodh> xnox: I vote for Monday (Warsaw's Second Law :)
</snip>

[lp:~jamesodhunt/ubuntu/utopic/cgmanager/enable-upstart-cgroup-support]

38. By James Hunt on 2014-07-17

d/cgmanager.cgproxy.upstart: Same change for cgproxy.

39. By James Hunt on 2014-07-17

* Doh.

[Serge Hallyn (serge-hallyn)]

Looks good to me, thanks. James, note that we now have upstart and sysv init scripts in upstream cgmanager git, under config/init/. Can you post a git pull request to do the same there?

[James Hunt (jamesodhunt)]

Done - https://github.com/cgmanager/cgmanager/commit/c1ef791ae9046438ddd3c8fffa04147e906cb297

[Dimitri John Ledkov (xnox)]

We also need user-session job to do the same notification on startup.

=== modified file 'debian/cgmanager.cgmanager.upstart'
--- debian/cgmanager.cgmanager.upstart	2014-04-14 00:13:44 +0000
+++ debian/cgmanager.cgmanager.upstart	2014-07-17 16:02:41 +0000
@@ -35,3 +35,5 @@
 
 	exec /sbin/cgmanager --sigstop $cgmanager_opts $cgm_extra_mounts
 end script
+
+post-start exec initctl notify-cgroup-manager-address "unix:path=/sys/fs/cgroup/cgmanager/sock" || true
 
=== modified file 'debian/cgmanager.cgproxy.upstart'
--- debian/cgmanager.cgproxy.upstart	2014-04-14 00:13:44 +0000
+++ debian/cgmanager.cgproxy.upstart	2014-07-17 16:02:41 +0000
@@ -30,4 +30,7 @@
 	exec /sbin/cgproxy --sigstop $cgmanager_opts
 end script
 
-post-start exec initctl emit -n cgmanager-ready
+post-start script
+initctl emit -n cgmanager-ready
+initctl notify-cgroup-manager-address "unix:path=/sys/fs/cgroup/cgmanager/sock" || true
+end script
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-07-10 12:37:44 +0000
+++ debian/changelog	2014-07-17 16:02:41 +0000
@@ -1,3 +1,10 @@
+cgmanager (0.26-0ubuntu6) UNRELEASED; urgency=medium
+
+  * d/cgmanager.cgmanager.upstart: Enable cgroup support in Upstart.
+  * d/cgmanager.cgproxy.upstart: Same change for cgproxy.
+
+ -- James Hunt <[e-mail]>  Thu, 17 Jul 2014 16:54:29 +0100
+
 cgmanager (0.26-0ubuntu5) utopic; urgency=medium
 
   * apply from upstream: