Merge lp:~vorlon/lxc-android-config/apport-job-cleanup into lp:lxc-android-config

[Steve Langasek]

Rework and simplify the apport overrides. Instead of adding two new upstart
jobs and an override for apport.conf, we can achieve everything we need to
with a single new apport job.

This leaves outstanding the issue that switching a device between channels
from the commandline will not cause the config to be correctly switched.

Rework and simplify the apport overrides. Instead of adding two new upstart
jobs and an override for apport.conf, we can achieve everything we need to
with a single new apport job.

This leaves outstanding the issue that switching a device between channels
from the commandline will not cause the config to be correctly switched.

Verified to work correctly on a stock Ubuntu 14.04 desktop system; will need
validating against the phone images also.

[Ken VanDine (ken-vandine)]

This no longer merges cleanly, please update the branch

review: Needs Fixing

[Ken VanDine (ken-vandine)]

Looks great and works well

review: Approve

[Ken VanDine (ken-vandine)]

QA failed this during landing. It seems to do the right thing at boot, but when toggling it via system-settings it no longer sets the core_pattern. It must not be starting and stopping the apport job on FILE=/var/lib/apport/autoreport

Not sure why though... but it does regress

review: Needs Fixing

[Brian Murray (brian-murray)]

It looks like there is an EVENT missing for the file watch, could that be the cause of the problem?

[Ken VanDine (ken-vandine)]

> It looks like there is an EVENT missing for the file watch, could that be the
> cause of the problem?

Oh, yeah I bet that's it, good catch. It needs the start on EVENT=create and stop on EVENT=delete.

[Steve Langasek (vorlon)]

On Fri, Feb 26, 2016 at 01:56:32PM -0000, Ken VanDine wrote:
> > It looks like there is an EVENT missing for the file watch, could that be the
> > cause of the problem?

> Oh, yeah I bet that's it, good catch. It needs the start on EVENT=create
> and stop on EVENT=delete.

FWIW I hadn't replied yet because I haven't had time to investigate for
sure, but I don't think this is the case. The EVENT= env var declaration
makes the match more specific; a match which does not include the EVENT=
should match a 'file' event with /any/ value of EVENT (or none at all).

Unmerged revisions

14. By Steve Langasek on 2016-02-04

Merge from trunk

13. By Steve Langasek on 2015-10-14

Further refinement: no apport override needed at all, do everything in the apport-config helper job

12. By Steve Langasek on 2015-10-14

rm -f is always polite

11. By Steve Langasek on 2015-10-14

Further reduction of the apport override

10. By Steve Langasek on 2015-10-14

Simplify apport handling, to avoid duplication of the main apport.conf
where avoidable and to simplify the event start model (avoiding possible
deadlocks).

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-12 12:52:17 +0000
+++ debian/changelog	2016-02-04 07:06:39 +0000
@@ -1,3 +1,11 @@
+lxc-android-config (0.230+16.04.20151112-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Simplify apport handling, to avoid duplication of the main apport.conf
+    where avoidable and to simplify the event start model (avoiding possible
+    deadlocks).
+
+ -- Steve Langasek <[e-mail]>  Wed, 14 Oct 2015 10:08:00 -0700
+
 lxc-android-config (0.230+16.04.20151112-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/lxc-android-config.maintscript'
--- debian/lxc-android-config.maintscript	2015-10-12 06:20:39 +0000
+++ debian/lxc-android-config.maintscript	2016-02-04 07:06:39 +0000
@@ -4,3 +4,5 @@
 rm_conffile /etc/init/bluetooth.override 0.230+15.10.20150930.2-0ubuntu1
 rm_conffile /etc/bluetooth/touch.conf 0.230+15.10.20150930.2-0ubuntu1
 rm_conffile /etc/init/set.pretty-hostname.conf 0.230+15.10.20150930.2-0ubuntu1
+rm_conffile /etc/init/apport-reconfig.conf 0.230+16.04.20151112-0ubuntu2~
+rm_conffile /etc/init/apport.override 0.230+16.04.20151112-0ubuntu2~

=== modified file 'etc/init/apport-config.conf'
--- etc/init/apport-config.conf	2015-09-30 17:17:07 +0000
+++ etc/init/apport-config.conf	2016-02-04 07:06:39 +0000
@@ -1,17 +1,20 @@
 description "Configure autoreport of crashes for all channels other than stable"
 
-start on runlevel [2345]
+start on starting apport or file FILE=/var/lib/apport/autoreport
 
 task
 
 script
-    if [ -f "/var/lib/apport/.apport-config-has-run" ]; then
-        stop; exit 0
-    fi
-    channel="$(cat /etc/system-image/channel.ini | grep channel | awk -F '/' '{print $2}')"
-    if [ "$channel" = "stable" ]; then
-        rm /var/lib/apport/autoreport || true
-    fi
-    touch /var/lib/apport/.apport-config-has-run
-    stop; exit 0
+    if [ ! -f "/var/lib/apport/.apport-config-has-run" ]; then
+        channel="$(cat /etc/system-image/channel.ini | grep channel | awk -F '/' '{print $2}')"
+        if [ "$channel" = "stable" ]; then
+            rm -f /var/lib/apport/autoreport || true
+        fi
+        touch /var/lib/apport/.apport-config-has-run
+    fi
+    if [ -e /var/lib/apport/autoreport ]; then
+        start apport || true
+    else
+        stop apport || true
+    fi
 end script

=== removed file 'etc/init/apport-reconfig.conf'
--- etc/init/apport-reconfig.conf	2015-10-14 13:36:55 +0000
+++ etc/init/apport-reconfig.conf	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-# apport - automatic crash report generation
-#
-# While this job is active, core dumps will captured by apport and
-# used to generate automatic crash reports.
-
-description	"automatic crash report generation"
-
-start on file FILE=/var/lib/apport/autoreport EVENT=create
-stop on file FILE=/var/lib/apport/autoreport EVENT=delete
-
-pre-start script
-    # don't start in containers
-    /bin/running-in-container && exit 0
-
-    # Only enable crash file generation if autoreport is enabled (LP: #1494442)
-    [ -e /var/lib/apport/autoreport ] || exit 0
-
-    echo "|/usr/share/apport/apport %p %s %c %P" > /proc/sys/kernel/core_pattern
-    echo 2 > /proc/sys/fs/suid_dumpable
-end script
-
-post-stop script
-    # don't stop in containers
-    /bin/running-in-container && exit 0
-
-    if [ "`dd if=/proc/sys/kernel/core_pattern count=1 bs=1 2>/dev/null`" != "|" ]
-    then
-	exit 1
-    else
-	echo 0 > /proc/sys/fs/suid_dumpable
-	echo "core" > /proc/sys/kernel/core_pattern
-    fi
-end script

=== removed file 'etc/init/apport.override'
--- etc/init/apport.override	2015-10-14 13:36:55 +0000
+++ etc/init/apport.override	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-# apport - automatic crash report generation
-#
-# While this job is active, core dumps will captured by apport and
-# used to generate automatic crash reports.
-
-description	"automatic crash report generation"
-
-start on runlevel [2345] and started apport-config
-stop on runlevel [!2345]
-
-env enabled=1
-
-pre-start script
-    # don't start in containers
-    /bin/running-in-container && exit 0
-
-    # Only enable crash file generation if autoreport is enabled (LP: #1494442)
-    [ -e /var/lib/apport/autoreport ] || exit 0
-
-    mkdir -p -m 1777 /var/crash
-
-    # check for kernel crash dump, convert it to apport report
-    if [ -e /var/crash/vmcore ] || [ -n "`ls /var/crash | egrep ^[0-9]{12}$`" ]
-    then
-	/usr/share/apport/kernel_crashdump || true
-    fi
-
-    # check for incomplete suspend/resume or hibernate
-    if [ -e /var/lib/pm-utils/status ]
-    then
-        /usr/share/apport/apportcheckresume || true
-        rm -f /var/lib/pm-utils/status
-        rm -f /var/lib/pm-utils/resume-hang.log
-    fi
-
-    echo "|/usr/share/apport/apport %p %s %c %P" > /proc/sys/kernel/core_pattern
-    echo 2 > /proc/sys/fs/suid_dumpable
-end script
-
-post-stop script
-    # don't stop in containers
-    /bin/running-in-container && exit 0
-
-    # Check for a hung resume.  If we find one try and grab everything
-    # we can to aid in its discovery
-    if [ -e /var/lib/pm-utils/status ]
-    then
-	ps -wwef > /var/lib/pm-utils/resume-hang.log
-    fi
-
-    if [ "`dd if=/proc/sys/kernel/core_pattern count=1 bs=1 2>/dev/null`" != "|" ]
-    then
-	exit 1
-    else
-	echo 0 > /proc/sys/fs/suid_dumpable
-	echo "core" > /proc/sys/kernel/core_pattern
-    fi
-end script