[Merge] lp:~jamesodhunt/upstart/bug-1357252 into lp:upstart

James Hunt james.hunt at canonical.com
Fri Aug 29 09:07:24 UTC 2014


James Hunt has proposed merging lp:~jamesodhunt/upstart/bug-1357252 into lp:upstart.

Requested reviews:
  Upstart Reviewers (upstart-reviewers)
Related bugs:
  Bug #1357252 in upstart : "upstart can race with cgmanager when using remove-on-empty"
  https://bugs.launchpad.net/upstart/+bug/1357252

For more details, see:
https://code.launchpad.net/~jamesodhunt/upstart/bug-1357252/+merge/232680

* init/cgroup.c:
  - Removed nih_debug() and nih_warn() calls since, although
    useful, this output pollutes job logs when running in debug mode.
  - cgroup_clear(): New function to request cgroups be removed.
  - cgroup_create(): Don't mark cgroups 'remove-on-empty' since Upstart
    can race with cgmanager.
* init/job.c: job_last_process(): New helper function.
* init/job_process.c:
  - job_process_spawn_with_fd(): Request that the
    cgroup manager destroy all job cgroups after upstart has created
    required cgroups for last job process which avoids the
    'remove-on-empty' race (LP: #1357252).
  - job_process_error_handler(): Added handling for new
    JOB_PROCESS_ERROR_CGROUP_CLEAR error.
* init/job_process.h: JobProcessErrorType: Added new
  JOB_PROCESS_ERROR_CGROUP_CLEAR error.
* init/tests/test_job.c: test_job_last_process(): New test for
  job_last_process().
-- 
https://code.launchpad.net/~jamesodhunt/upstart/bug-1357252/+merge/232680
Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/bug-1357252 into lp:upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 12838 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/upstart-devel/attachments/20140829/2a80e5ed/attachment.diff>


More information about the upstart-devel mailing list