Launchpad itself

Merge lp:~cjwatson/launchpad/staging-postgresql-10 into lp:launchpad

  1. staging-postgresql-10
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 18912
Proposed branch: lp:~cjwatson/launchpad/staging-postgresql-10
Merge into: lp:launchpad
Diff against target: 32 lines (+3/-5)
1 file modified
database/replication/Makefile (+3/-5)
To merge this branch: bzr merge lp:~cjwatson/launchpad/staging-postgresql-10
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+365020@code.launchpad.net

Commit message

Update stagingsetup for PostgreSQL 10.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

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