diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/sgml/ref/pg_ctl-ref.sgml | 9 | ||||
| -rw-r--r-- | doc/src/sgml/runtime.sgml | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index f4200718c7a..2d0b8a33ee2 100644 --- a/doc/src/sgml/ref/pg_ctl-ref.sgml +++ b/doc/src/sgml/ref/pg_ctl-ref.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.44 2007/11/10 21:48:51 momjian Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.45 2008/04/23 13:44:58 mha Exp $ PostgreSQL documentation --> @@ -133,9 +133,10 @@ 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 waits for all the clients to - disconnect. This is the default. <quote>Fast</quote> mode does - not wait for clients to disconnect. All active transactions are + option: <quote>Smart</quote> mode waits for online backup mode + to finish and all the clients to disconnect. This is the default. + <quote>Fast</quote> mode 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 all server processes without a clean shutdown. This will lead to diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index 63259faff5a..5c36f9fce00 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -1,4 +1,4 @@ -<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.414 2008/04/17 20:56:41 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.415 2008/04/23 13:44:58 mha Exp $ --> <chapter Id="runtime"> <title>Operating System Environment</title> @@ -1307,6 +1307,7 @@ sysctl -w vm.overcommit_memory=2 <listitem> <para> After receiving <systemitem>SIGTERM</systemitem>, the server + waits until online backup mode is no longer active. It then disallows new connections, but lets existing sessions end their work normally. It shuts down only after all of the sessions terminate normally. This is the <firstterm>Smart @@ -1322,7 +1323,9 @@ sysctl -w vm.overcommit_memory=2 The server disallows new connections and sends all existing server processes <systemitem>SIGTERM</systemitem>, which will cause them to abort their current transactions and exit promptly. It then - waits for the server processes to exit and finally shuts down. This is the + waits for the server processes to exit and finally shuts down. + If the server is in online backup mode, backup mode will be + terminated, rendering the backup useless. This is the <firstterm>Fast Shutdown</firstterm>. </para> </listitem> |