← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~stub/launchpad/staging into lp:launchpad

 

Stuart Bishop has proposed merging lp:~stub/launchpad/staging into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #809123 in Launchpad itself: "we cannot deploy DB schema changes live"
  https://bugs.launchpad.net/launchpad/+bug/809123

For more details, see:
https://code.launchpad.net/~stub/launchpad/staging/+merge/68937

Systems reconnecting after the outage is good, so stop complaining
-- 
https://code.launchpad.net/~stub/launchpad/staging/+merge/68937
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stub/launchpad/staging into lp:launchpad.
=== modified file 'database/schema/full-update.py'
--- database/schema/full-update.py	2011-07-21 05:00:54 +0000
+++ database/schema/full-update.py	2011-07-23 05:33:26 +0000
@@ -106,7 +106,9 @@
             return pgbouncer_rc
         pgbouncer_down = False
 
-        preflight_rc = run_script('preflight.py')
+        # We will start seeing connections as soon as pgbouncer is
+        # reenabled, so ignore them here.
+        preflight_rc = run_script('preflight.py', '--skip-connection-check')
         if preflight_rc != 0:
             return preflight_rc