session-manager

Merge lp:~ogra/session-manager/fix-oom_adj into lp:session-manager

  1. fix-oom_adj
  2. Merge into trunk
Proposed by Oliver Grawert
Status: Needs review
Proposed branch: lp:~ogra/session-manager/fix-oom_adj
Merge into: lp:session-manager
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
ubuntu-session (+1/-1)
To merge this branch: bzr merge lp:~ogra/session-manager/fix-oom_adj
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Salveti Pending
Review via email: mp+166975@code.launchpad.net

Commit message

in saucy /proc/$$/oom_adj is not writable for some reason, until this is fixed make sure ubuntu-session still starts

Description of the change

in saucy /proc/$$/oom_adj is not writable for some reason, until this is fixed make sure ubuntu-session still starts

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:57
http://jenkins.qa.ubuntu.com/job/session-manager-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-raring-armhf-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/session-manager-raring-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/session-manager-ci/15/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
Oliver Grawert (ogra) wrote :

for a proper fix i guess we need to ship an apparmor profile that allows access to /proc/$$/oom_adj

Reply
Revision history for this message
Oliver Grawert (ogra) wrote :

in fact, after some discussion on IRC it seems that this should not be possible at all, it appears to be a bug in the android container implementation)

in a proper ubuntu install a child can never have a lower oom value than it's parent, given we are started from upstart and upstart defaults to always have 0 for this value, we should not be able to go lower unless explicitly allowed via the CAP_SYS_RESOURCE capability. we should either remove this code completely or discuss with the security team if that capablility can be allowed.

Reply

Unmerged revisions

57. By Oliver Grawert

set release to saucy

56. By Oliver Grawert

make sure ubuntu-session can still start even if oom_adj is not writable (needed in saucy)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-05-23 22:43:18 +0000
3+++ debian/changelog 2013-06-02 14:07:30 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-session (0.49) saucy; urgency=low
6+
7+ * make sure ubuntu-session can still start even if oom_adj is not
8+ writable (needed in saucy)
9+
10+ -- Oliver Grawert <ogra@ubuntu.com> Sun, 02 Jun 2013 16:01:20 +0200
11+
12 ubuntu-session (0.48-0ubuntu1) raring; urgency=low
13
14 * Removing need for FORM_FACTOR.
15
16=== modified file 'ubuntu-session'
17--- ubuntu-session 2013-05-23 21:02:48 +0000
18+++ ubuntu-session 2013-06-02 14:07:30 +0000
19@@ -50,7 +50,7 @@
20
21 # Default for any application executed from this script
22 DEFAULT_OOMADJ=-10
23-echo $DEFAULT_OOMADJ > /proc/$$/oom_adj
24+echo $DEFAULT_OOMADJ > /proc/$$/oom_adj || true
25
26 # Initialize environment
27 for var in $(cat /etc/environment); do

Subscribers

People subscribed via source and target branches