Merge lp:~thumper/launchpad/revision-karma-fix into lp:launchpad

[Tim Penhey]

Break out of the loop if karma is ever not allocated.

[Tim Penhey (thumper)]

The count added before is too inefficient so removed it.

Changed the looping logic, and stop if we ever fail to allocate karma as it will infinite-loop otherwise.

If it does die, it gives us the revision_id from which to start debugging.

[Michael Hudson-Doyle (mwhudson)]

I guess you could even say logger.critical(), but it looks fine.

review: Approve

=== modified file 'lib/lp/code/scripts/revisionkarma.py'
--- lib/lp/code/scripts/revisionkarma.py	2010-01-05 01:51:56 +0000
+++ lib/lp/code/scripts/revisionkarma.py	2010-01-06 04:11:20 +0000
@@ -39,20 +39,26 @@
         count = 0
         revision_set = getUtility(IRevisionSet)
         # Break into bits.
-        result_set = revision_set.getRevisionsNeedingKarmaAllocated()
-        self.logger.info("%d revisions to update", result_set.count())
-        revisions = list(result_set[:100])
-        while len(revisions) > 0:
+        while True:
+            revisions = list(
+                revision_set.getRevisionsNeedingKarmaAllocated()[:100])
+            if len(revisions) == 0:
+                break
             for revision in revisions:
                 # Find the appropriate branch, and allocate karma to it.
                 # Make sure we don't grab a junk branch though, as we don't
                 # allocate karma for junk branches.
                 branch = revision.getBranch(
                     allow_private=True, allow_junk=False)
-                revision.allocateKarma(branch)
+                karma = revision.allocateKarma(branch)
+                if karma is None:
+                    error_msg = (
+                        'No karma generated for revid: %s (%s)' %
+                        (revision.revision_id, revision.id))
+                    self.logger.critical(error_msg)
+                    # Stop now to avoid infinite loop.
+                    raise AssertionError(error_msg)
                 count += 1
             self.logger.debug("%s processed", count)
             transaction.commit()
-            revisions = list(
-                revision_set.getRevisionsNeedingKarmaAllocated()[:100])
         self.logger.info("Finished updating revision karma")