From 0badb069bc9f590dbc1306ccbd51e99ed81f228c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 31 Mar 2015 11:46:27 -0400
Subject: [PATCH] pg_ctl: change default shutdown mode from 'smart' to 'fast'
Retain the order of the options in the documentation.
---
doc/src/sgml/ref/pg_ctl-ref.sgml | 6 +++---
src/bin/pg_ctl/pg_ctl.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 29f882bd76..2df65db0bd 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -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>
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 8202633d05..ea6db8c26b 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -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;