Merge lp:~louis/ubuntu/raring/apport/apport_kdump_blueprint into lp:ubuntu/raring/apport

[Louis Bouchard]

Modified kernel_crashdump to pick up dmesg output from timestamped directory created by kdump-tools which replaces the kexec-tools mechanism to handle kernel crash dump

https://blueprints.launchpad.net/ubuntu/+spec/servercloud-r-kdump-tool

Includes upstart script modification

[Martin Pitt (pitti)]

On hold until the question/problem in the upstream MP is sorted out:

https://code.launchpad.net/~louis-bouchard/apport/apport_kdump-tools-blueprint/+merge/149498

[lp:~louis/ubuntu/raring/apport/apport_kdump_blueprint]

351. By Louis Bouchard on 2013-02-22

Avoid touching the report's package name

352. By Louis Bouchard on 2013-02-22

Fix changelog test entry

[Louis Bouchard (louis)]

Updated according to modification in trunk

review: Needs Resubmitting

[lp:~louis/ubuntu/raring/apport/apport_kdump_blueprint]

353. By Louis Bouchard on 2013-02-27

Add cleanup for new kdump-tools timestampted directories

354. By Louis Bouchard on 2013-02-27

Add test hook for new kdump-tools report format

355. By Louis Bouchard on 2013-02-27

Modify test for robustness

356. By Louis Bouchard on 2013-02-27

Fix find syntax to avoid file not found error

[Louis Bouchard (louis)]

Modified according to review in trunk :

 * added -n to /etc/init/apport.conf
 * added a test to ./test/test_hooks.py
 * added clean up instructions in /etc/cron.daily/apport

Old behavior has been kept to allow for previous method to work if kdump-tools is not installed

review: Needs Resubmitting

[Martin Pitt (pitti)]

The upstream bits landed in trunk now, so I'll use this MP to update the upstart job on the packaging side. Thanks!

review: Approve

[Martin Pitt (pitti)]

You used the wrong packaging branch (it's the one in Vcs-Bzr:, not lp:ubuntu/apport), so I cannot formally merge this. But I committed the remainder of this MP, i. e. the upstart job change:

http://bazaar.launchpad.net/~ubuntu-core-dev/ubuntu/raring/apport/ubuntu/revision/2166

=== modified file 'data/kernel_crashdump'
--- data/kernel_crashdump	2012-05-18 16:33:53 +0000
+++ data/kernel_crashdump	2013-02-27 16:09:19 +0000
@@ -11,35 +11,51 @@
 # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
 # the full text of the license.
 
-import os, sys
+import os, sys, re
 import apport, apport.fileutils
 
-vmcore_path = os.path.join(apport.fileutils.report_dir, 'vmcore')
-
-if not os.path.exists(vmcore_path):
-    sys.exit(0)
+vmcore_root = os.path.join(apport.fileutils.report_dir)
+vmcore_path = os.path.join(vmcore_root, 'vmcore')
 
 pr = apport.Report('KernelCrash')
 pr['Package'] = apport.packaging.get_kernel_package()
 
-pr['VmCore'] = (vmcore_path,)
 pr.add_os_info()
 if os.path.exists(vmcore_path + '.log'):
     pr['VmCoreLog'] = (vmcore_path + '.log',)
 
-# write report
-try:
-    with open(apport.fileutils.make_report_path(pr), 'wb') as f:
-        pr.write(f)
-except IOError as e:
-    apport.fatal('Cannot create report: ' + str(e))
+if os.path.exists(vmcore_path):
+    pr['VmCore'] = (vmcore_path,)
+    try:
+        with open(apport.fileutils.make_report_path(pr), 'wb') as f:
+            pr.write(f)
+    except IOError as e:
+        apport.fatal('Cannot create report: ' + str(e))
+else:
+# kdump-tools has moved vmcore to timestamped dir
+    for root, dirs, files in os.walk(vmcore_root):
+        for timedir in dirs:
+            if re.search('^[0-9]{12}$', timedir):
+                vmcore_dir = os.path.join(vmcore_root, timedir)
+                dmesgfile = os.path.join(vmcore_dir, 'dmesg.' + timedir)
+                report_name = pr['Package'] + '-' + timedir + '.crash'
+                crash_report = os.path.join(vmcore_root, report_name)
+                pr['VmCoreDmesg'] = (dmesgfile,)
+                if not os.path.exists(crash_report):
+                    try:
+                        with open(crash_report, 'wb') as f:
+                            pr.write(f)
+                    except IOError as e:
+                        apport.fatal('Cannot create report: ' + str(e))
 
-# clean up the core files
-try:
-    os.unlink(vmcore_path)
-except OSError:
-    pass  # huh, already gone?
-try:
-    os.unlink(vmcore_path + '.log')
-except OSError:
-    pass
+# clean up the core file
+# if not generated by kdump-tools
+if os.path.exists(vmcore_path):
+    try:
+        os.unlink(vmcore_path)
+    except OSError:
+        pass  # huh, already gone?
+    try:
+        os.unlink(vmcore_path + '.log')
+    except OSError:
+        pass

=== modified file 'debian/apport.upstart'
--- debian/apport.upstart	2011-10-19 09:39:41 +0000
+++ debian/apport.upstart	2013-02-27 16:09:19 +0000
@@ -17,7 +17,7 @@
     mkdir -p -m 1777 /var/crash
 
     # check for kernel crash dump, convert it to apport report
-    if [ -e /var/crash/vmcore ]
+    if [ -e /var/crash/vmcore ] || [ -n "`ls /var/crash | egrep ^[0-9]{12}$`" ]
     then
 	/usr/share/apport/kernel_crashdump || true
     fi

=== modified file 'etc/cron.daily/apport'
--- etc/cron.daily/apport	2012-03-22 18:55:17 +0000
+++ etc/cron.daily/apport	2013-02-27 16:09:19 +0000
@@ -2,3 +2,4 @@
 # clean all crash reports which are older than a week.
 [ -d /var/crash ] || exit 0
 find /var/crash/. ! -name . -prune -type f \( \( -size 0 -a \! -name '*.upload*' \) -o -mtime +7 \) -exec rm -f -- '{}' \;
+find /var/crash/. ! -name . -prune -type d -regextype posix-extended -regex '.*/[0-9]{12}$' \( -mtime +7 \) -exec rm -Rf -- '{}' \;

=== modified file 'test/test_hooks.py'
--- test/test_hooks.py	2012-07-18 12:31:50 +0000
+++ test/test_hooks.py	2013-02-27 16:09:19 +0000
@@ -11,6 +11,8 @@
 
 import unittest, subprocess, tempfile, os, shutil, os.path, sys, optparse
 
+from datetime import datetime
+
 import apport, apport.fileutils
 
 # parse command line options
@@ -136,8 +138,8 @@
 
         self.assertEqual(r['Tags'], 'dist-upgrade verybad')
 
-    def test_kernel_crashdump(self):
-        '''kernel_crashdump.'''
+    def test_kernel_crashdump_kexec(self):
+        '''kernel_crashdump using kexec-tools.'''
 
         f = open(os.path.join(apport.fileutils.report_dir, 'vmcore'), 'wb')
         f.write(b'\x01' * 100)
@@ -169,6 +171,40 @@
         r.add_package_info(r['Package'])
         self.assertTrue(' ' in r['Package'])  # appended version number
 
+    def test_kernel_crashdump_kdump(self):
+        '''kernel_crashdump using kdump-tools.'''
+
+        timedir = datetime.strftime(datetime.now(),"%Y%m%d%H%M")
+        vmcore_dir = os.path.join(apport.fileutils.report_dir, timedir)
+        os.mkdir(vmcore_dir)
+
+        dmesgfile = os.path.join(vmcore_dir, 'dmesg.' + timedir)
+        f = open(dmesgfile, 'wt')
+        f.write('1' * 100)
+        f.close()
+
+        self.assertEqual(subprocess.call('%s/kernel_crashdump' % datadir), 0,
+                         'kernel_crashdump finished successfully')
+
+        reps = apport.fileutils.get_new_reports()
+        self.assertEqual(len(reps), 1, 'kernel_crashdump created a report')
+
+        r = apport.Report()
+        with open(reps[0], 'rb') as f:
+            r.load(f)
+
+        self.assertEqual(set(r.keys()), set(['Date', 'Package', 'ProblemType',
+                                             'VmCoreDmesg', 'Uname',
+                                             'Architecture', 'DistroRelease']))
+        self.assertEqual(r['ProblemType'], 'KernelCrash')
+        self.assertEqual(r['VmCoreDmesg'], '1' * 100)
+        self.assertTrue('linux' in r['Package'])
+
+        self.assertTrue(os.uname()[2].split('-')[0] in r['Package'])
+
+        r.add_package_info(r['Package'])
+        self.assertTrue(' ' in r['Package'])  # appended version number
+
     @classmethod
     def _gcc_version_path(klass):
         '''Determine a valid version and executable path of gcc and return it