Merge lp:~stub/launchpad/oops-pruning into lp:launchpad

[Stuart Bishop]

The OOPS pruner is fairly DB intensive and has no need to connect to the master database at all. Make it connect to the slave database instead.

The OOPS pruner is fairly DB intensive and has no need to connect to the master database at all. Make it connect to the slave database instead.

[Gary Poster (gary)]

Great, thank you!

review: Approve

=== modified file 'lib/canonical/launchpad/scripts/ftests/test_oops_prune.py'
--- lib/canonical/launchpad/scripts/ftests/test_oops_prune.py	2009-08-07 12:46:37 +0000
+++ lib/canonical/launchpad/scripts/ftests/test_oops_prune.py	2010-03-19 09:17:09 +0000
@@ -17,6 +17,7 @@
 import unittest
 
 from pytz import UTC
+import transaction
 
 from canonical.config import config
 from canonical.testing import LaunchpadZopelessLayer
@@ -61,6 +62,10 @@
         if not os.path.exists(config.error_reports.error_dir):
             os.mkdir(config.error_reports.error_dir)
 
+        # Need to commit or the changes are not visible on the slave.
+        transaction.commit()
+
+
     def tearDown(self):
         shutil.rmtree(self.oops_dir)
         shutil.rmtree(config.error_reports.error_dir)
@@ -99,6 +104,10 @@
                 whiteboard=NULL
                 WHERE id=2
             """)
+
+        # Need to commit or the changes are not visible on the slave.
+        transaction.commit()
+
         self.failUnlessEqual(
                 set([
                     self.referenced_oops_code,

=== modified file 'lib/canonical/launchpad/scripts/oops.py'
--- lib/canonical/launchpad/scripts/oops.py	2009-06-25 05:30:52 +0000
+++ lib/canonical/launchpad/scripts/oops.py	2010-03-19 09:17:09 +0000
@@ -3,6 +3,8 @@
 
 """Module docstring goes here."""
 
+from __future__ import with_statement
+
 __metaclass__ = type
 
 __all__ = [
@@ -18,6 +20,7 @@
 
 from canonical.database.sqlbase import cursor
 from canonical.launchpad.webapp import errorlog
+from canonical.launchpad.webapp.dbpolicy import SlaveOnlyDatabasePolicy
 from canonical.launchpad.webapp.tales import FormattersAPI
 
 def referenced_oops():
@@ -51,18 +54,19 @@
 
     referenced_codes = set()
 
-    cur = cursor()
-    cur.execute(query)
-    for content in (row[0] for row in cur.fetchall()):
-        found = False
-        for match in FormattersAPI._re_linkify.finditer(content):
-            if match.group('oops') is not None:
-                code_string = match.group('oopscode')
-                referenced_codes.add(code_string.upper())
-                found = True
-        assert found, \
-            'PostgreSQL regexp matched content that Python regexp ' \
-            'did not (%r)' % (content,)
+    with SlaveOnlyDatabasePolicy():
+        cur = cursor()
+        cur.execute(query)
+        for content in (row[0] for row in cur.fetchall()):
+            found = False
+            for match in FormattersAPI._re_linkify.finditer(content):
+                if match.group('oops') is not None:
+                    code_string = match.group('oopscode')
+                    referenced_codes.add(code_string.upper())
+                    found = True
+            assert found, \
+                'PostgreSQL regexp matched content that Python regexp ' \
+                'did not (%r)' % (content,)
 
     return referenced_codes