launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/staging-postgresql-10 into lp:launchpad.

Commit message:
Update stagingsetup for PostgreSQL 10.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/staging-postgresql-10/+merge/365020
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/staging-postgresql-10 into lp:launchpad.

=== modified file 'database/replication/Makefile'
--- database/replication/Makefile	2018-05-14 13:11:14 +0000
+++ database/replication/Makefile	2019-03-25 08:26:18 +0000
@@ -2,8 +2,8 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 #
 # This makefile is used to build and replicate the staging database.
-# To build a replicated development environent, replicate your 9.3 main
-# cluster with standard PG 9.3 streaming replication per the PG docs.
+# To build a replicated development environent, replicate your 10 main
+# cluster with standard PG 10 streaming replication per the PG docs.
 #
 # To test the staging rebuild script:
 #
@@ -56,8 +56,6 @@
 stagingsetup:
 	# List the dump first to make sure it is usable before destroying
 	# anything.
-	# XXX wgrant 2017-11-16: Exclude tsearch2 bits that are
-	# erreonously being dumped now.
 	pg_restore --list ${STAGING_DUMP} | grep -v 'TRIGGER public _sl_' \
 	    > ${DUMPLIST}
 
@@ -82,7 +80,7 @@
 	# later running security.py, to pull in permissions granted on
 	# production to users not maintained by security.py.
 	cat ${STAGING_DUMP} \
-	    | ./walblock.py -n 5000 -d /var/lib/postgresql/9.3/staging/pg_xlog \
+	    | ./walblock.py -n 5000 -d /var/lib/postgresql/10/staging/pg_wal \
 	    | pg_restore --dbname=lpmain_staging --no-owner ${EXIT_ON_ERROR} \
 		--use-list=${DUMPLIST} -v
 	rm ${DUMPLIST}