Merge lp:~allenap/launchpad/early-batching-limit-bug-509223 into lp:launchpad

[Gavin Panella]

In checkwatches, limit the number of bug watches to consider at any time to 1000.

Artificially limit the number of bug watches to consider to 1000. This approach is a bit inelegant and ham-fisted, but it's an approach that has made checkwatches considerably more reliable in production (since being cherry-picked last week, gnome-bugs is basically up to date).

[Brad Crittenden (bac)]

This merge proposal is my favorite of the day because it mentions ham and cherries.

The code looks good too.

review: Approve (code)

=== modified file 'lib/lp/bugs/scripts/checkwatches/updater.py'
--- lib/lp/bugs/scripts/checkwatches/updater.py	2010-04-21 09:34:31 +0000
+++ lib/lp/bugs/scripts/checkwatches/updater.py	2010-04-21 09:34:32 +0000
@@ -422,8 +422,12 @@
     def _updateBugTracker(self, bug_tracker, batch_size=None):
         """Updates the given bug trackers's bug watches."""
         with self.transaction:
+            # Never work with more than 1000 bug watches at a
+            # time. Especially after a release or an outage, a large
+            # bug tracker could have have >10000 bug watches eligible
+            # for update.
             bug_watches_to_update = (
-                bug_tracker.watches_needing_update)
+                bug_tracker.watches_needing_update.config(limit=1000))
             bug_watches_need_updating = (
                 bug_watches_to_update.count() > 0)
 
 
=== modified file 'lib/lp/bugs/scripts/tests/test_bugimport.py'
--- lib/lp/bugs/scripts/tests/test_bugimport.py	2010-03-26 13:48:53 +0000
+++ lib/lp/bugs/scripts/tests/test_bugimport.py	2010-04-21 09:34:32 +0000
@@ -807,6 +807,9 @@
     Returns a list with a `count` method.
     """
 
+    def config(self, limit):
+        return self.__class__(self[:limit])
+
     def count(self):
         """See `SelectResults`."""
         return len(self)