lp:~upstart-devel/upstart/stateful-reexec

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Merged into lp:upstart at revision 1382

Steve Langasek: Approve on 2012-11-13

Diff: 15453 lines (+11010/-675)

41 files modified

ChangeLog (+16/-0)
configure.ac (+33/-0)
extra/man/upstart-udev-bridge.8 (+4/-1)
init/Makefile.am (+64/-33)
init/blocked.c (+53/-0)
init/blocked.h (+8/-0)
init/conf.c (+93/-35)
init/conf.h (+12/-4)
init/control.c (+145/-2)
init/control.h (+15/-0)
init/event.c (+331/-0)
init/event.h (+22/-0)
init/event_operator.c (+175/-7)
init/event_operator.h (+7/-4)
init/job.c (+726/-7)
init/job.h (+14/-2)
init/job_class.c (+712/-3)
init/job_class.h (+36/-1)
init/job_process.c (+44/-7)
init/job_process.h (+6/-0)
init/log.c (+213/-15)
init/log.h (+13/-5)
init/main.c (+114/-26)
init/parse_job.c (+42/-1)
init/parse_job.h (+5/-0)
init/process.c (+223/-0)
init/process.h (+38/-3)
init/session.c (+298/-33)
init/session.h (+19/-6)
init/state.c (+2008/-0)
init/state.h (+1226/-0)
init/tests/test_conf.c (+1/-43)
init/tests/test_event_operator.c (+92/-1)
init/tests/test_job.c (+215/-60)
init/tests/test_job_process.c (+508/-291)
init/tests/test_log.c (+19/-35)
init/tests/test_state.c (+2637/-0)
init/tests/test_util.c (+27/-0)
init/tests/test_util.h (+304/-0)
util/man/telinit.8 (+4/-3)
util/tests/test_initctl.c (+488/-47)

api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1476. By James Hunt on 2012-11-14

* extra/man/upstart-udev-bridge.8: Corrected explanation of actions in
  udev events (thanks to Stefan Bader for pointing out this problem).
* init/blocked.c: blocked_type_str_to_enum(): Assert argument.
* init/job_class.c: job_class_expect_type_str_to_enum(): Assert
  argument.
* init/job_process.c: job_process_run(): Reverted unnecessary check on 'p'.
* init/log.c: log_deserialise(): Added cast and explanation why return code
  from state_toggle_cloexec() not checked.
* init/process.c: process_type_str_to_enum(): Assert argument.
* init/session.c:
  - session_create_conf_source(): Removed redundant getenv() call.
  - session_deserialise(): Removed incorrect uid_t initialisation.
* init/state.h:
  - state_get_json_str_array_generic(): Actually use env parameter.
  - Remove warn_unused_result from state_toggle_cloexec() to avoid compile
    failure with strict flags.
* init/tests/test_state.c:
  - Use rlim_t.
  - test_enums():
    - Don't call *_str_to_enum() if previous *_enum_to_str() failed.
    - Add additional checks for invalid enum values.
  - main(): Remove redundant setenv().
* init/tests/test_util.c: string_check(): Make initial test less
  cryptic.

1475. By James Hunt on 2012-11-14

* init/job_class.c: Formatting.
* init/log.c: Corrected documentation for log_unflushed_files.
* init/state.h: Explained why log_unflushed_files is not currently
  serialised.

1474. By James Hunt on 2012-11-14

Sync with lp:~upstart-devel/upstart/stateful-reexec.

1473. By James Hunt on 2012-11-07

Upstream sync.

1472. By James Hunt on 2012-11-07

* Changelog: Summary of stateful re-exec feature.
* util/man/telinit.8: Removed warning about using 'telinit u'.

1471. By James Hunt on 2012-11-07

Tidy up.

1470. By James Hunt on 2012-11-07

* init/tests/test_job_process.c:
  - New macro CHECK_FILE_EQ() to repeatedly check for expected file contents.
  - main(): Make parent wait for child in fork mode.
  - Converted appropriate TEST_FILE_EQ() calls to CHECK_FILE_EQ() to
    fix problem resulting from peculiar but permissible kernel behaviour
    (LP: #1066351).
* init/tests/test_util.h: New macros:
  - TEST_WATCH_UPDATE_TIMEOUT_SECS().
  - TEST_FORCE_WATCH_UPDATE_TIMEOUT_SECS().

1469. By James Hunt on 2012-11-05

tidy up

1468. By James Hunt on 2012-10-26

* init/job.c: job_serialise_all(): Typo.
* util/tests/test_initctl.c:
  - WAIT_FOR_UPSTART(): Fix nasty bug where session bus rather than the
    *test* session bus was being checked. Added extra check.
  - _START_UPSTART: Added extra check.
  - KILL_UPSTART: Added extra check.
  - job_to_pid(): Handle failure gracefully which makes function more
    useful for caller. Free regex.
  - test_reexec(): Improved test "single job producing output across a
    re-exec".

1467. By James Hunt on 2012-10-22

* util/tests/test_initctl.c:
  - START_UPSTART: Fix check for @confdir and @logdir.
  - CREATE_FILE: Treat @contents safely.
  - job_to_pid(): New function.
  - test_reexec(): New function with signle complex test:
    "single job producing output across a re-exec"