Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7e2b1c0

Browse files
committed
Make pg_upgrade's test script attempt to select a non-conflicting port.
Previously, the port number used in this test script was hard-wired atpg_upgrade's default of 50432; which is not so great because parallel buildruns might conflict. Commit3d53173removed this setting for the postmasters started by the script proper(not by pg_upgrade), which didn't do anything to fix that problem and alsoguaranteed a failure if there was a live postmaster at the build's defaultport number. Instead, select a non-conflicting temporary port number inthe same way that pg_regress.c does. (Its method isn't entirelybulletproof, but given the lack of complaints I'm not going to worryabout that today.)In passing, unset MAKEFLAGS and MAKELEVEL to avoid problems with thescript's internal invocations of make, for the same reason pg_regress.cdoes: it could cause problems in a parallel make.
1 parentc263f16 commit7e2b1c0

File tree

1 file changed

+29
-4
lines changed

1 file changed

+29
-4
lines changed

‎contrib/pg_upgrade/test.sh

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ set -e
1313

1414
:${MAKE=make}
1515

16+
# Guard against parallel make issues (see comments in pg_regress.c)
17+
unset MAKEFLAGS
18+
unset MAKELEVEL
19+
20+
# Set listen_addresses desirably
1621
testhost=`uname -s`
1722

1823
case$testhostin
@@ -65,6 +70,12 @@ PGDATA="$BASE_PGDATA.old"
6570
export PGDATA
6671
rm -rf"$BASE_PGDATA""$PGDATA"
6772

73+
logdir=$PWD/log
74+
rm -rf"$logdir"
75+
mkdir"$logdir"
76+
77+
# Clear out any environment vars that might cause libpq to connect to
78+
# the wrong postmaster (cf pg_regress.c)
6879
unset PGDATABASE
6980
unset PGUSER
7081
unset PGSERVICE
@@ -74,9 +85,23 @@ unset PGCONNECT_TIMEOUT
7485
unset PGHOST
7586
unset PGHOSTADDR
7687

77-
logdir=$PWD/log
78-
rm -rf"$logdir"
79-
mkdir"$logdir"
88+
# Select a non-conflicting port number, similarly to pg_regress.c
89+
PG_VERSION_NUM=`grep'#define PG_VERSION_NUM'$newsrc/src/include/pg_config.h| awk'{print $3}'`
90+
PGPORT=`expr$PG_VERSION_NUM % 16384 + 49152`
91+
export PGPORT
92+
93+
i=0
94+
while psql -X postgres</dev/null2>/dev/null
95+
do
96+
i=`expr$i + 1`
97+
if [$i-eq 16 ]
98+
then
99+
echo port$PGPORT apparentlyin use
100+
exit 1
101+
fi
102+
PGPORT=`expr$PGPORT + 1`
103+
export PGPORT
104+
done
80105

81106
# enable echo so the user can see what is being executed
82107
set -x
@@ -123,7 +148,7 @@ PGDATA=$BASE_PGDATA
123148

124149
initdb -N
125150

126-
pg_upgrade -d"${PGDATA}.old" -D"${PGDATA}" -b"$oldbindir" -B"$bindir"
151+
pg_upgrade -d"${PGDATA}.old" -D"${PGDATA}" -b"$oldbindir" -B"$bindir" -p"$PGPORT" -P"$PGPORT"
127152

128153
pg_ctl start -l"$logdir/postmaster2.log" -o"$POSTMASTER_OPTS" -w
129154

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp