Merge lp:~mterry/ubuntu-system-settings/crashed-socket into lp:ubuntu-system-settings

[Michael Terry]

Prevent a crash in unity8 when the wizard also crashes or stops early. (LP: #1355892)

Move some of the socket cleanup from the 'cleanup' wizard job to the main job, while also avoiding the race that would create by stopping and starting unity8's job more carefully.

Prevent a crash in unity8 when the wizard also crashes or stops early. (LP: #1355892)

Move some of the socket cleanup from the 'cleanup' wizard job to the main job, while also avoiding the race that would create by stopping and starting unity8's job more carefully.

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 NA, just upstart changes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 NA, just upstart changes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 Yes

 * Has a 5 minute exploratory testing run been executed on N4?
 Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 NA

 * What components might get impacted by your changes?
 Just wizard

 * Have you requested review by the teams of these owning components?
 Yeah

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1062
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1520/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5071/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3701
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/712
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4819/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6323
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6323/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3093
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4010
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4010/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1520/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, looks fine in principle to me but I can't test it due to the issue I mentioned on https://code.launchpad.net/~mterry/ubuntu-system-settings/flickable-passwd-page/+merge/235117

Comment approving but letting somebody who can run the wizard to change the status

review: Approve

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'wizard/ubuntu-system-settings-wizard-cleanup.conf'
--- wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-09-02 12:44:42 +0000
+++ wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-09-20 00:42:11 +0000
@@ -1,11 +1,8 @@
 description "Welcome to Ubuntu Cleanup"
 author "Michael Terry <[e-mail]>"
 
-# These are all tasks that need to be completed after wizard is done, but
-# before unity8 starts.  We pause unity8 bring-up by starting the wizard on
-# "starting unity8" but as soon as we try to kill/stop the wizard, upstart
-# will begin running unity8.  So instead, we start this job which ends our main
-# wizard task when done.
+# These are all tasks that need to be completed only if the wizard was
+# intentionally stopped (i.e. the user clicked 'Finish' at the end)
 
 task
 
@@ -13,29 +10,11 @@
 env RUN_FILE=".config/ubuntu-system-settings/wizard-has-run"
 
 script
-    setenv() {
-        initctl set-env --global $1=$2
-        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'$1': '$2'}"
-    }
-
-    echo "Ending wizard"
-    # Undo changes to global variables
-    if [ -n "$WIZARD_ORIG_MIR_SOCKET" ]; then
-        echo "Resetting MIR_SOCKET to $WIZARD_ORIG_MIR_SOCKET"
-        setenv MIR_SOCKET $WIZARD_ORIG_MIR_SOCKET
-    fi
-
-    # Stop any indicators and OSK so they will be restarted with new environment
-    initctl emit indicator-services-end
-    stop maliit-server || true
-end script
-
-post-stop script
-    stop ubuntu-system-settings-wizard
-
     # Don't run again in the future.  We do this here, rather than in the main
     # job because we only want to run this code if user actually clicked on the
     # "Finish" button.
     mkdir -p $(dirname "$HOME/$RUN_FILE")
     touch "$HOME/$RUN_FILE" || true
+
+    stop ubuntu-system-settings-wizard
 end script

=== modified file 'wizard/ubuntu-system-settings-wizard.conf'
--- wizard/ubuntu-system-settings-wizard.conf	2014-08-18 13:09:48 +0000
+++ wizard/ubuntu-system-settings-wizard.conf	2014-09-20 00:42:11 +0000
@@ -11,8 +11,13 @@
 
 pre-start script
     if [ -e "$HOME/$RUN_FILE" ]; then
+        initctl set-env WIZARD_SKIPPED=true
         stop
     else
+        # Stop unity8, we'll start it again in post-stop (this avoids a race
+        # between post-stop and unity8 unpausing)
+        stop --no-wait $JOB
+
         # Tell unity-mir to raise SIGSTOP after we start
         initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
 
@@ -40,5 +45,31 @@
 exec system-settings-wizard
 
 post-stop script
-    rm -f "$XDG_RUNTIME_DIR/wizard_socket"
+    if [ -n "$WIZARD_SKIPPED" ]; then
+        exit
+    fi
+
+    setenv() {
+        initctl set-env --global $1=$2
+        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'$1': '$2'}"
+    }
+
+    echo "Ending wizard"
+
+    if [ -S "$MIR_SERVER_FILE" ]; then
+        rm -f "$MIR_SERVER_FILE"
+    fi
+
+    # Undo changes to global variables
+    if [ -n "$WIZARD_ORIG_MIR_SOCKET" ]; then
+        echo "Resetting MIR_SOCKET to $WIZARD_ORIG_MIR_SOCKET"
+        setenv MIR_SOCKET $WIZARD_ORIG_MIR_SOCKET
+    fi
+
+    # Stop any indicators and OSK so they will be restarted with new environment
+    initctl emit indicator-services-end
+    stop maliit-server || true
+
+    # And finally, resume unity8
+    start --no-wait $JOB || true
 end script