NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commiteb9812f

committed

Make pg_upgrade's test.sh less chatty.

The use of "set -x" to echo a subset of the test's commands might'vebeen a good idea during development of this test, but it's been stablefor long enough now that the extra output isn't very useful. Alsoour project expectations have been trending towards less output innon-error cases; the fact that "set -x" produces output on stderris particularly annoying from that standpoint. So get rid of it.Also, pass "-A trust" to initdb explicitly so that it won't issuea warning about "trust" being an insecure default. This matcheswhat the TAP tests have done for a long time, and again gets ridof some noise on stderr.Discussion:https://postgr.es/m/21766.1558397960@sss.pgh.pa.us

1 parentf03a9ca commiteb9812fCopy full SHA for eb9812f

File tree

1 file changed

-8

lines changed

src/bin/pg_upgrade
- test.sh

1 file changed

-8

lines changed

`‎src/bin/pg_upgrade/test.sh`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ unset MAKELEVEL`
`22`	`22`	`standard_initdb() {`
`23`	`23`	`# To increase coverage of non-standard segment size and group access`
`24`	`24`	`# without increasing test runtime, run these tests with a custom setting.`
`25`		`-"$1" -N --wal-segsize 1 -g`
	`25`	`+# Also, specify "-A trust" explicitly to suppress initdb's warning.`
	`26`	`+"$1" -N --wal-segsize 1 -g -A trust`
`26`	`27`	`if [-n"$TEMP_CONFIG"-a-r"$TEMP_CONFIG" ]`
`27`	`28`	`then`
`28`	`29`	`cat"$TEMP_CONFIG">>"$PGDATA/postgresql.conf"`
`@@ -150,9 +151,6 @@ done`
`150`	`151`	`EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --port=$PGPORT"`
`151`	`152`	`export EXTRA_REGRESS_OPTS`
`152`	`153`
`153`		`-# enable echo so the user can see what is being executed`
`154`		`-set -x`
`155`		`-`
`156`	`154`	`standard_initdb"$oldbindir"/initdb`
`157`	`155`	`"$oldbindir"/pg_ctl start -l"$logdir/postmaster1.log" -o"$POSTMASTER_OPTS" -w`
`158`	`156`
`@@ -256,10 +254,6 @@ esac`
`256`	`254`	`pg_dumpall --no-sync -f"$temp_root"/dump2.sql\|\| pg_dumpall2_status=$?`
`257`	`255`	`pg_ctl -m fast stop`
`258`	`256`
`259`		`-# no need to echo commands anymore`
`260`		`-set +x`
`261`		`-echo`
`262`		`-`
`263`	`257`	`if [-n"$pg_dumpall2_status" ];then`
`264`	`258`	`echo"pg_dumpall of post-upgrade database cluster failed"`
`265`	`259`	`exit 1`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commiteb9812f

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/test.sh`

0 commit comments