launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/staging-restore-hax into lp:launchpad.

Commit message:
Fix staging restores and make them more verbose.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/staging-restore-hax/+merge/333787

Fix staging restores and make them more verbose.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/staging-restore-hax into lp:launchpad.

=== modified file 'database/replication/Makefile'
--- database/replication/Makefile	2016-09-06 14:02:09 +0000
+++ database/replication/Makefile	2017-11-16 03:40:07 +0000
@@ -56,8 +56,10 @@
 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}
+	    | grep -v 'OPERATOR FAMILY ts2' > ${DUMPLIST}
 
 	# Deny new connections to the main DBs and kill any leftovers.
 	${STAGING_PGBOUNCER} -c 'DISABLE launchpad_staging'
@@ -82,7 +84,7 @@
 	cat ${STAGING_DUMP} \
 	    | ./walblock.py -n 5000 -d /var/lib/postgresql/9.3/staging/pg_xlog \
 	    | pg_restore --dbname=lpmain_staging --no-owner ${EXIT_ON_ERROR} \
-		--use-list=${DUMPLIST}
+		--use-list=${DUMPLIST} -v
 	rm ${DUMPLIST}
 	# Apply database patches.
 	@echo Running upgrade.py `date`.