Merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-rate-of-crashes into lp:ubuntu-archive-tools

[Brian Murray]

I've updated the error tracker to use the phased-update percentage when calculating the rate of crashes for one package version to another package version. This updates the phased-updater to pass the phased-update-percentage to the Error Tracker. It also turns on the rate of crash checking now that we have sufficient data for comparing package versions.

=== modified file 'phased-updater'
--- phased-updater	2014-10-23 18:05:19 +0000
+++ phased-updater	2015-01-30 18:35:30 +0000
@@ -428,7 +428,7 @@
     return (None, None)
 
 
-def crash_rate_increase(release, src_pkg, version):
+def crash_rate_increase(release, src_pkg, version, last_pup):
     pvers, date = package_previous_version(release, src_pkg, version)
     date = str(date).replace('-', '')
     if not pvers:
@@ -437,9 +437,9 @@
         return False
     release_name = 'Ubuntu ' + release.version
     rate_url = BASE_ERRORS_URL + 'package-rate-of-crashes/?format=json' + \
-        '&release=%s&package=%s&old_version=%s&new_version=%s&date=%s' % \
+        '&release=%s&package=%s&old_version=%s&new_version=%s&phased_update_percentage=%s&date=%s' % \
         (quote(release_name), quote(src_pkg), quote(pvers), quote(version),
-         date)
+         last_pup, date)
     rate_file = urlopen(rate_url)
     if rate_file.getcode() >= 400:
         logging.error('HTTP error retrieving %s' % rate_url)
@@ -546,20 +546,12 @@
                 else:
                     issues[rname][pub_source] = {}
                     issues[rname][pub_source]['buckets'] = problems
-            # 2014-06-12 turn off rate_increase as we have a new database
-            rate_increase = False
-            #rate_increase = crash_rate_increase(release, src_pkg, version)
-            if rate_increase and (src_pkg, version) not in rate_overrides:
-                if pub_source not in issues[rname]:
-                    issues[rname][pub_source] = {}
-                issues[rname][pub_source]['rate'] = rate_increase
             if pbs:
                 # the p-u-p is currently the same for all binary packages
                 last_pup = pbs[0].phased_update_percentage
-                if pub_source not in issues[rname]:
-                    issues[rname][pub_source] = {}
-                # phasing has stopped so check what the max value was
-                if last_pup == 0:
+            else:
+                last_pup = None
+            if last_pup == 0:
                     for allpb in archive.getPublishedBinaries(
                             exact_match=True, pocket='Updates',
                             binary_name=pbs[0].binary_package_name):
@@ -567,6 +559,19 @@
                             if allpb.phased_update_percentage > 0:
                                 max_pup = allpb.phased_update_percentage
                                 break
+            if max_pup and last_pup == 0:
+                rate_increase = crash_rate_increase(release, src_pkg, version, max_pup)
+            else:
+                rate_increase = crash_rate_increase(release, src_pkg, version, last_pup)
+            if rate_increase and (src_pkg, version) not in rate_overrides:
+                if pub_source not in issues[rname]:
+                    issues[rname][pub_source] = {}
+                issues[rname][pub_source]['rate'] = rate_increase
+            if pbs:
+                if pub_source not in issues[rname]:
+                    issues[rname][pub_source] = {}
+                # phasing has stopped so check what the max value was
+                if last_pup == 0:
                     issues[rname][pub_source]['max_pup'] = max_pup
                 issues[rname][pub_source]['pup'] = last_pup
             suite = rname + '-updates'