mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_ctl: change default shutdown mode from 'smart' to 'fast'

Browse Source 
Retain the order of the options in the documentation.
This commit is contained in:
Bruce Momjian 2015-03-31 11:46:27 -04:00
parent 9d9991c84e
commit 0badb069bc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/sgml/ref/pg_ctl-ref.sgml
View File

@ -173,11 +173,11 @@ PostgreSQL documentation
In <option>stop</option> mode, the server that is running in
the specified data directory is shut down. Three different
shutdown methods can be selected with the <option>-m</option>
option. <quote>Smart</quote> mode (the default) waits for all active
option. <quote>Smart</quote> mode waits for all active
clients to disconnect and any online backup to finish.
If the server is in hot standby, recovery and streaming replication
will be terminated once all clients have disconnected.
<quote>Fast</quote> mode does not wait for clients to disconnect and
<quote>Fast</quote> mode (the default) does not wait for clients to disconnect and
will terminate an online backup in progress. All active transactions are
rolled back and clients are forcibly disconnected, then the
server is shut down. <quote>Immediate</quote> mode will abort
@ -292,7 +292,7 @@ PostgreSQL documentation
Specifies the shutdown mode. <replaceable>mode</replaceable>
can be <literal>smart</literal>, <literal>fast</literal>, or
<literal>immediate</literal>, or the first letter of one of
these three. If this is omitted, <literal>smart</literal> is used.
these three. If this is omitted, <literal>fast</literal> is used.
</para>
</listitem>
</varlistentry>

2
src/bin/pg_ctl/pg_ctl.c
View File

@ -79,7 +79,7 @@ static bool do_wait = false;
static bool wait_set = false;
static int wait_seconds = DEFAULT_WAIT;
static bool silent_mode = false;
static ShutdownMode shutdown_mode = SMART_MODE;
static ShutdownMode shutdown_mode = FAST_MODE;
static int sig = SIGTERM; /* default */
static CtlCommand ctl_command = NO_COMMAND;
static char *pg_data = NULL;