lp:~jamesodhunt/upstart/bug-530779

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:upstart

Steve Langasek: Needs Fixing on 2013-12-02

Diff: 24650 lines (+24167/-52)

13 files modified

ChangeLog (+57/-0)
init/Makefile.am (+2/-1)
init/job.c (+17/-18)
init/job_process.c (+41/-6)
init/process.c (+27/-6)
init/process.h (+6/-0)
init/tests/data/upstart-1.12.json (+21708/-0)
init/tests/test_job_process.c (+483/-10)
init/tests/test_state.c (+190/-10)
test/Makefile.am (+8/-1)
test/test_daemon.c (+1485/-0)
test/test_util_common.c (+116/-0)
test/test_util_common.h (+27/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #530779: init: does not wait for parent to exit when following forks

Medium

In Progress

Link a bug report

Related blueprints

1582. By James Hunt on 2014-01-13

* Sync with lp:upstart.

1581. By James Hunt on 2014-01-13

* init/tests/test_job_process.c: test_run_subreaper(): Separate the
  prctl(PR_SET_CHILD_SUBREAPER) test into a new function and only call
  if the running kernel supports that prctl.
* test/test_util_common.c: get_kernel_version(): New function.

1580. By James Hunt on 2013-12-12

* init/tests/data/upstart-1.12.json: New test data file.
* test/test_daemon.c: New test utility.
* init/Makefile.am: Add "upstart-1.12.json".
* init/job.c:
  - Updated copyright.
  - job_deserialise(): Generalise logic to handle missing pids when
    upgrading from a version that does not support PROCESS_SECURITY and
    PROCESS_DAEMON_PARENT.
* init/job_process.c:
  - Copyright and comments.
  - job_process_terminated(): Consider job ready when daemons parent
    exits, rather than when the requisite number of forks have been
    performed (based on lp:~vorlon/upstart/lp.530779-rough-draft)
    (LP: #530779).
  - job_process_trace_new(): Corrected comment header.
  - job_process_trace_new_child(): Don't consider job ready once
    requisite number of forks have occured any more.
  - job_process_trace_fork(): Save parent process.
* init/process.c:
  - Updated copyright.
  - process_name(): Added PROCESS_DAEMON_PARENT for completeness.
  - process_from_name(): Added PROCESS_DAEMON_PARENT for completeness.
  - process_deserialise_all(): Generalise logic to handle missing pids
    when upgrading from a version that does not support PROCESS_SECURITY and
    PROCESS_DAEMON_PARENT.
  - process_type_enum_to_str(): Added PROCESS_DAEMON_PARENT for completeness.
  - process_type_str_to_enum(): Added PROCESS_DAEMON_PARENT for completeness.
* init/process.h: Comments for ProcessType (which must be kept in order).
* init/tests/test_job_process.c:
  - test_run(): New test:
    - "with daemon where parent waits for ultimate child before exiting"
  - test_spawn(): Remove temporary files.
  - test_kill(): Extra checks.
  - test_handler():
    - Remove erroneous UPSTART_LOGDIR code - not used by this test.
    - Add daemon parent checks.
* init/tests/test_state.c:
  - test_job_environ_upgrade(): Add additional checks to ensure that
    json not containing PROCESS_DAEMON_PARENT elements correctly deserialises
    into empty elements.
  - test_daemon_parent_state(): New test that checks a data file containing
    jobs with and without PROCESS_DAEMON_PARENTS can be deserialised.
* test/Makefile.am: Updated for test_daemon.
* test/test_util_common.c:
  - get_test_daemon_binary(): New function.
  - file_line_count(): New function.
* test/test_util_common.h: TIMED_BLOCK(): New utility macro.

1579. By Steve Langasek on 2013-12-04

Merge lp:~clint-fewbar/upstart/typo

1578. By James Hunt on 2013-11-25

* Merge of lp:~vorlon/upstart/more-log-flushing-tests.

1577. By James Hunt on 2013-11-25

* Merge of lp:~vorlon/upstart/lp.1254326.

1576. By Steve Langasek on 2013-11-18

Fix a typo in the manpage

1575. By James Hunt on 2013-11-18

* Merge of lp:~xnox/upstart/no-multibuild.

1574. By James Hunt on 2013-11-18

* init/tests/test_state.c: Remove unused variables to make test compile
  in strict mode.

1573. By James Hunt on 2013-11-18

* Merged lp:~vorlon/upstart/flaky-log-serialization-test.