lp:~jamesodhunt/upstart/bug-1227212

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:upstart at revision 1534

Dimitri John Ledkov: Approve on 2013-09-27

Diff: 568 lines (+321/-34)

8 files modified

ChangeLog (+35/-0)
init/event.c (+20/-0)
init/job_process.c (+14/-3)
init/quiesce.c (+176/-23)
init/quiesce.h (+3/-0)
test/test_util_common.c (+24/-5)
test/test_util_common.h (+4/-1)
util/tests/test_initctl.c (+45/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1227212: Session logout takes too long

High

Fix Released

Link a bug report

Related blueprints

1534. By James Hunt on 2013-09-26

* init/event.c: event_pending_handle_jobs(): Force quiesce when all job
  instances have finished to speed session shutdown.
* init/job_process.c: job_process_jobs_running(): Only consider job
  instances with associated pids to avoid abstract jobs confusing the
  shutdown.
* init/quiesce.c:
  - quiesce(): Optimise session shutdown
    - Skip wait phase if no jobs care about the 'session-end' event
      (LP: #1227212).
    - Stop already running instances if other jobs care about
      'session-end' to allow the already-running jobs to shut down in
       parallel with the newly-started session-end jobs.
  - quiesce_wait_callback():
    - Simplify logic.
    - Improve wait phase checks to detect earliest time to finalise.
  - quiesce_finalise(): Display time to shutdown.
  - quiesce_complete(): New function to force final shutdown phase.
  - quiesce_event_match(): New function to determine if any jobs
    'start on' contains a particular event.
  - quiesce_in_progress(): Determine if shutdown is being handled.
* test/test_util_common.c:
  - _start_upstart(): Call get_upstart_binary() rather than relying on
    UPSTART_BINARY define.
  - start_upstart_common(): Remove '--no-startup-event' as this is now
    needed by a test.
  - get_upstart_binary(): Assert that file exists.
  - file_exists(): New helper function.
* test/test_util_common.h: Typo and prototype.
* util/tests/test_initctl.c: test_quiesce():
  - New test "session shutdown: one long-running job which starts on
    startup".
  - Adjusted expected shutdown times.

1533. By Dimitri John Ledkov on 2013-09-13

adjust test case to not key on the text of error messages which will vary

1532. By Dimitri John Ledkov on 2013-09-13

Trailing \ typo

1531. By Dimitri John Ledkov on 2013-09-13

Trailing \ typo

1530. By Steve Langasek on 2013-09-13

don't pass cflags from unrelated libraries when building, only pass them to
those bridges which use the relevant libraries.

1529. By Steve Langasek on 2013-09-12

Correct the copyright notice:
 - Scott's copyright applies to code written in 2011 only
 - Canonical's copyright dates back to 2006

1528. By James Hunt on 2013-09-12

* Merge lp:~jamesodhunt/upstart/test-quiesce-cleanup.

1527. By Steve Langasek on 2013-09-01

Merge lp:~ted/upstart/obj-path

1526. By James Hunt on 2013-08-23

* NEWS: Begin new release.

1525. By James Hunt on 2013-08-23

* NEWS: Release 1.10