database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-21 12:05:57 +03:00
Code

Make pg_upgrade's test.sh less chatty.

Browse Source 
Remove "set -x", and pass "-A trust" to initdb explicitly,
to suppress almost all of the noise this script used to emit
on stderr.

This back-patches commit eb9812f27 into out-of-support branches,
pursuant to newly-established project policy.  The point is to
suppress useless noise on stderr when running check-world.

Discussion: https://postgr.es/m/d0316012-ece7-7b7e-2d36-9c38cb77cb3b@enterprisedb.com
This commit is contained in:
Tom Lane 2021-12-12 16:14:25 -05:00
parent 70c64135d0
commit a4061eeaf3
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/pg_upgrade/test.sh
View File

@ -18,7 +18,8 @@ export PGPORT
# Run a given "initdb" binary and overlay the regression testing # Run a given "initdb" binary and overlay the regression testing
# authentication configuration. # authentication configuration.
standard_initdb() { standard_initdb() {
"$1" # Specify "-A trust" explicitly to suppress initdb's warning.
"$1" -A trust
if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ] if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
then then
cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf" cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
@ -126,9 +127,6 @@ logdir=`pwd`/log
rm -rf "$logdir" rm -rf "$logdir"
mkdir "$logdir" mkdir "$logdir"
# enable echo so the user can see what is being executed
set -x
standard_initdb "$oldbindir"/initdb standard_initdb "$oldbindir"/initdb
$oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w $oldbindir/pg_ctl start -l "$logdir/postmaster1.log" -o "$POSTMASTER_OPTS" -w
@ -200,10 +198,6 @@ esac
pg_dumpall -f "$temp_root"/dump2.sql || pg_dumpall2_status=$? pg_dumpall -f "$temp_root"/dump2.sql || pg_dumpall2_status=$?
pg_ctl -m fast stop pg_ctl -m fast stop
# no need to echo commands anymore
set +x
echo
if [ -n "$pg_dumpall2_status" ]; then if [ -n "$pg_dumpall2_status" ]; then
echo "pg_dumpall of post-upgrade database cluster failed" echo "pg_dumpall of post-upgrade database cluster failed"
exit 1 exit 1