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

Commita88f449

Browse files
committed
Change pg_upgrade to use port 50432 by default to avoid unintended
client connections during the upgrade. Also rename data/bin/portenvironment variables to being with 'PG'. Also no longer honor PGPORT.
1 parent8977952 commita88f449

File tree

4 files changed

+35
-25
lines changed

4 files changed

+35
-25
lines changed

‎contrib/pg_upgrade/check.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ output_check_banner(bool *live_check)
2929
if (user_opts.check&&is_server_running(old_cluster.pgdata))
3030
{
3131
*live_check= true;
32+
if (old_cluster.port==DEF_PGUPORT)
33+
pg_log(PG_FATAL,"When checking a live old server, "
34+
"you must specify the old server's port number.\n");
3235
if (old_cluster.port==new_cluster.port)
3336
pg_log(PG_FATAL,"When checking a live server, "
3437
"the old and new port numbers must be different.\n");

‎contrib/pg_upgrade/option.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ parseCommandLine(int argc, char *argv[])
5858
os_info.progname=get_progname(argv[0]);
5959

6060
/* Process libpq env. variables; load values here for usage() output */
61-
old_cluster.port=getenv("PGPORT") ?atoi(getenv("PGPORT")) :DEF_PGPORT;
62-
new_cluster.port=getenv("PGPORT") ?atoi(getenv("PGPORT")) :DEF_PGPORT;
61+
old_cluster.port=getenv("PGPORTOLD") ?atoi(getenv("PGPORTOLD")) :DEF_PGUPORT;
62+
new_cluster.port=getenv("PGPORTNEW") ?atoi(getenv("PGPORTNEW")) :DEF_PGUPORT;
6363

6464
os_user_effective_id=get_user_info(&os_info.user);
6565
/* we override just the database user name; we got the OS id above */
@@ -203,13 +203,13 @@ parseCommandLine(int argc, char *argv[])
203203
}
204204

205205
/* Get values from env if not already set */
206-
check_required_directory(&old_cluster.bindir,"OLDBINDIR","-b",
206+
check_required_directory(&old_cluster.bindir,"PGBINOLD","-b",
207207
"old cluster binaries reside");
208-
check_required_directory(&new_cluster.bindir,"NEWBINDIR","-B",
208+
check_required_directory(&new_cluster.bindir,"PGBINNEW","-B",
209209
"new cluster binaries reside");
210-
check_required_directory(&old_cluster.pgdata,"OLDDATADIR","-d",
210+
check_required_directory(&old_cluster.pgdata,"PGDATAOLD","-d",
211211
"old cluster data resides");
212-
check_required_directory(&new_cluster.pgdata,"NEWDATADIR","-D",
212+
check_required_directory(&new_cluster.pgdata,"PGDATANEW","-D",
213213
"new cluster data resides");
214214
}
215215

@@ -254,17 +254,17 @@ For example:\n\
254254
or\n"),old_cluster.port,new_cluster.port,os_info.user);
255255
#ifndefWIN32
256256
printf(_("\
257-
$ exportOLDDATADIR=oldCluster/data\n\
258-
$ exportNEWDATADIR=newCluster/data\n\
259-
$ exportOLDBINDIR=oldCluster/bin\n\
260-
$ exportNEWBINDIR=newCluster/bin\n\
257+
$ exportPGDATAOLD=oldCluster/data\n\
258+
$ exportPGDATANEW=newCluster/data\n\
259+
$ exportPGBINOLD=oldCluster/bin\n\
260+
$ exportPGBINNEW=newCluster/bin\n\
261261
$ pg_upgrade\n"));
262262
#else
263263
printf(_("\
264-
C:\\> setOLDDATADIR=oldCluster/data\n\
265-
C:\\> setNEWDATADIR=newCluster/data\n\
266-
C:\\> setOLDBINDIR=oldCluster/bin\n\
267-
C:\\> setNEWBINDIR=newCluster/bin\n\
264+
C:\\> setPGDATAOLD=oldCluster/data\n\
265+
C:\\> setPGDATANEW=newCluster/data\n\
266+
C:\\> setPGBINOLD=oldCluster/bin\n\
267+
C:\\> setPGBINNEW=newCluster/bin\n\
268268
C:\\> pg_upgrade\n"));
269269
#endif
270270
printf(_("\nReport bugs to <pgsql-bugs@postgresql.org>.\n"));

‎contrib/pg_upgrade/pg_upgrade.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
#include"libpq-fe.h"
1717

18+
/* Use port in the private/dynamic port number range */
19+
#defineDEF_PGUPORT50432
20+
1821
/* Allocate for null byte */
1922
#defineUSER_NAME_SIZE128
2023

‎doc/src/sgml/pgupgrade.sgml‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@
6060
<term><option>-b</option> <replaceable>old_bindir</></term>
6161
<term><option>--old-bindir=</option><replaceable>old_bindir</></term>
6262
<listitem><para>the old cluster executable directory;
63-
environment variable <envar>OLDBINDIR</></para></listitem>
63+
environment variable <envar>PGBINOLD</></para></listitem>
6464
</varlistentry>
6565

6666
<varlistentry>
6767
<term><option>-B</option> <replaceable>new_bindir</></term>
6868
<term><option>--new-bindir=</option><replaceable>new_bindir</></term>
6969
<listitem><para>the new cluster executable directory;
70-
environment variable <envar>NEWBINDIR</></para></listitem>
70+
environment variable <envar>PGBINNEW</></para></listitem>
7171
</varlistentry>
7272

7373
<varlistentry>
@@ -80,14 +80,14 @@
8080
<term><option>-d</option> <replaceable>old_datadir</></term>
8181
<term><option>--old-datadir=</option><replaceable>old_datadir</></term>
8282
<listitem><para>the old cluster data directory; environment
83-
variable <envar>OLDDATADIR</></para></listitem>
83+
variable <envar>PGDATAOLD</></para></listitem>
8484
</varlistentry>
8585

8686
<varlistentry>
8787
<term><option>-D</option> <replaceable>new_datadir</></term>
8888
<term><option>--new-datadir=</option><replaceable>new_datadir</></term>
8989
<listitem><para>the new cluster data directory; environment
90-
variable <envar>NEWDATADIR</></para></listitem>
90+
variable <envar>PGDATANEW</></para></listitem>
9191
</varlistentry>
9292

9393
<varlistentry>
@@ -118,14 +118,14 @@
118118
<term><option>-p</option> <replaceable>old_port_number</></term>
119119
<term><option>--old-port=</option><replaceable>old_portnum</></term>
120120
<listitem><para>the old cluster port number; environment
121-
variable <envar>PGPORT</></para></listitem>
121+
variable <envar>PGPORTOLD</></para></listitem>
122122
</varlistentry>
123123

124124
<varlistentry>
125125
<term><option>-P</option> <replaceable>new_port_number</></term>
126126
<term><option>--new-port=</option><replaceable>new_portnum</></term>
127127
<listitem><para>the new cluster port number; environment
128-
variable <envar>PGPORT</></para></listitem>
128+
variable <envar>PGPORTNEW</></para></listitem>
129129
</varlistentry>
130130

131131
<varlistentry>
@@ -256,8 +256,7 @@ gmake prefix=/usr/local/pgsql.new install
256256
so you might want to set authentication to <literal>trust</> in
257257
<filename>pg_hba.conf</>, or if using <literal>md5</> authentication,
258258
use a <filename>~/.pgpass</> file (see <xref linkend="libpq-pgpass">)
259-
to avoid being prompted repeatedly for a password. Also make sure
260-
pg_upgrade is the only program that can connect to the clusters.
259+
to avoid being prompted repeatedly for a password.
261260
</para>
262261
</step>
263262

@@ -303,9 +302,14 @@ NET STOP pgsql-8.3 (<productname>PostgreSQL</> 8.3 and older used a different s
303302
copying), but you will not be able to access your old cluster
304303
once you start the new cluster after the upgrade. Link mode also
305304
requires that the old and new cluster data directories be in the
306-
same file system. See <literal>pg_upgrade --help</> for a full
307-
list of options.
308-
</para>
305+
same file system.
306+
</para>
307+
308+
<para>
309+
<application>pg_upgrade</> defaults to running servers on port
310+
50432 to avoid unintended client connections. See <literal>pg_upgrade
311+
--help</> for a full list of options.
312+
</para>
309313

310314
<para>
311315
For Windows users, you must be logged into an administrative account, and

0 commit comments

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