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

Commite574f15

Browse files
committed
Updates to reflect that pg_ctl stop -m fast is the default
Various example and test code used -m fast explicitly, but since it'sthe default, this can be omitted now or should be replaced by a betterexample.pg_upgrade is not touched, so it can continue to operate with olderinstallations.
1 parent5ad966a commite574f15

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎contrib/start-scripts/freebsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ case $1 in
4848
echo -n' postgresql'
4949
;;
5050
stop)
51-
su -l$PGUSER -c"$PGCTL stop -D '$PGDATA' -s -m fast"
51+
su -l$PGUSER -c"$PGCTL stop -D '$PGDATA' -s"
5252
;;
5353
restart)
54-
su -l$PGUSER -c"$PGCTL stop -D '$PGDATA' -s -m fast -w"
54+
su -l$PGUSER -c"$PGCTL stop -D '$PGDATA' -s -w"
5555
su -l$PGUSER -c"$DAEMON -D '$PGDATA' &">>$PGLOG2>&1
5656
;;
5757
status)

‎contrib/start-scripts/linux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ case $1 in
9797
;;
9898
stop)
9999
echo -n"Stopping PostgreSQL:"
100-
su -$PGUSER -c"$PGCTL stop -D '$PGDATA' -s -m fast"
100+
su -$PGUSER -c"$PGCTL stop -D '$PGDATA' -s"
101101
echo"ok"
102102
;;
103103
restart)
104104
echo -n"Restarting PostgreSQL:"
105-
su -$PGUSER -c"$PGCTL stop -D '$PGDATA' -s -m fast -w"
105+
su -$PGUSER -c"$PGCTL stop -D '$PGDATA' -s -w"
106106
test -e"$PG_OOM_ADJUST_FILE"&&echo"$PG_MASTER_OOM_SCORE_ADJ">"$PG_OOM_ADJUST_FILE"
107107
su -$PGUSER -c"$DAEMON_ENV$DAEMON -D '$PGDATA' &">>$PGLOG2>&1
108108
echo"ok"

‎contrib/start-scripts/osx/PostgreSQL

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ StartService () {
9090

9191
StopService () {
9292
ConsoleMessage"Stopping PostgreSQL database server"
93-
sudo -u$PGUSER sh -c"$PGCTL stop -D '${PGDATA}' -s -m fast"
93+
sudo -u$PGUSER sh -c"$PGCTL stop -D '${PGDATA}' -s"
9494
}
9595

9696
RestartService () {
9797
if ["${POSTGRESQL:=-NO-}"="-YES-" ];then
9898
ConsoleMessage"Restarting PostgreSQL database server"
9999
# should match StopService:
100-
sudo -u$PGUSER sh -c"$PGCTL stop -D '${PGDATA}' -s -m fast"
100+
sudo -u$PGUSER sh -c"$PGCTL stop -D '${PGDATA}' -s"
101101
# should match StartService:
102102
if ["${ROTATELOGS}"="1" ];then
103103
sudo -u$PGUSER sh -c"${DAEMON} -D '${PGDATA}' &"2>&1|${LOGUTIL}"${PGLOG}"${ROTATESEC}&

‎doc/src/sgml/ref/pg_ctl-ref.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ PostgreSQL documentation
615615
The <option>-m</option> option allows control over
616616
<emphasis>how</emphasis> the server shuts down:
617617
<screen>
618-
<prompt>$</prompt> <userinput>pg_ctl stop -mfast</userinput>
618+
<prompt>$</prompt> <userinput>pg_ctl stop -msmart</userinput>
619619
</screen></para>
620620
</refsect2>
621621

‎src/bin/pg_ctl/t/001_start_stop.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
sleep 3if ($windows_os);
4343
command_fails(['pg_ctl','start','-D',"$tempdir/data",'-w' ],
4444
'second pg_ctl start -w fails');
45-
command_ok(['pg_ctl','stop','-D',"$tempdir/data",'-w','-m','fast' ],
45+
command_ok(['pg_ctl','stop','-D',"$tempdir/data",'-w' ],
4646
'pg_ctl stop -w');
47-
command_fails(['pg_ctl','stop','-D',"$tempdir/data",'-w','-m','fast' ],
47+
command_fails(['pg_ctl','stop','-D',"$tempdir/data",'-w' ],
4848
'second pg_ctl stop fails');
4949

50-
command_ok(['pg_ctl','restart','-D',"$tempdir/data",'-w','-m','fast' ],
50+
command_ok(['pg_ctl','restart','-D',"$tempdir/data",'-w' ],
5151
'pg_ctl restart with server not running');
52-
command_ok(['pg_ctl','restart','-D',"$tempdir/data",'-w','-m','fast' ],
52+
command_ok(['pg_ctl','restart','-D',"$tempdir/data",'-w' ],
5353
'pg_ctl restart with server running');
5454

55-
system_or_bail'pg_ctl','stop','-D',"$tempdir/data",'-m','fast';
55+
system_or_bail'pg_ctl','stop','-D',"$tempdir/data";

‎src/bin/pg_ctl/t/002_status.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
command_exit_is(['pg_ctl','status','-D',$node->data_dir ],
2323
0,'pg_ctl status with server running');
2424

25-
system_or_bail'pg_ctl','stop','-D',$node->data_dir,'-m','fast';
25+
system_or_bail'pg_ctl','stop','-D',$node->data_dir;

‎src/test/regress/pg_regress.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ stop_postmaster(void)
265265
fflush(stderr);
266266

267267
snprintf(buf,sizeof(buf),
268-
"\"%s%spg_ctl\" stop -D \"%s/data\" -s -m fast",
268+
"\"%s%spg_ctl\" stop -D \"%s/data\" -s",
269269
bindir ?bindir :"",
270270
bindir ?"/" :"",
271271
temp_instance);

‎src/tools/msvc/vcregress.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ sub upgradecheck
465465
@args = ('pg_dumpall','-f',"$tmp_root/dump1.sql");
466466
system(@args) == 0orexit 1;
467467
print"\nStopping old cluster\n\n";
468-
system("pg_ctl-m faststop") == 0orexit 1;
468+
system("pg_ctl stop") == 0orexit 1;
469469
$ENV{PGDATA} ="$data";
470470
print"\nSetting up new cluster\n\n";
471471
standard_initdb()orexit 1;
@@ -483,7 +483,7 @@ sub upgradecheck
483483
@args = ('pg_dumpall','-f',"$tmp_root/dump2.sql");
484484
system(@args) == 0orexit 1;
485485
print"\nStopping new cluster\n\n";
486-
system("pg_ctl-m faststop") == 0orexit 1;
486+
system("pg_ctl stop") == 0orexit 1;
487487
print"\nDeleting old cluster\n\n";
488488
system(".\\delete_old_cluster.bat") == 0orexit 1;
489489
print"\nComparing old and new cluster dumps\n\n";

0 commit comments

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