diff options
| author | Robert Haas | 2010-04-08 01:39:37 +0000 |
|---|---|---|
| committer | Robert Haas | 2010-04-08 01:39:37 +0000 |
| commit | 1c850fa80727180d03bdb6a8c2f672eeda7fa818 (patch) | |
| tree | 246905862626a014a449187a6a7fb82193e90db4 /doc | |
| parent | 2c0870ff7ab9bda44f39dd332836d0928afb2297 (diff) | |
Make smart shutdown work in combination with Hot Standby/Streaming Replication.
At present, killing the startup process does not release any locks it holds,
so we must wait to stop the startup and walreceiver processes until all
read-only backends have exited. Without this patch, the startup and
walreceiver processes never exit, so the server gets permanently stuck in
a half-shutdown state.
Fujii Masao, with review, docs, and comment adjustments by me.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/sgml/ref/pg_ctl-ref.sgml | 4 | ||||
| -rw-r--r-- | doc/src/sgml/runtime.sgml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml index e11e59a3fa1..99d9eb0ca72 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.49 2010/04/03 07:23:01 petere Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.50 2010/04/08 01:39:37 rhaas Exp $ PostgreSQL documentation --> @@ -152,6 +152,8 @@ PostgreSQL documentation shutdown methods can be selected with the <option>-m</option> option: <quote>Smart</quote> mode waits for online backup mode to finish and all the clients to disconnect. This is the default. + If the server is in recovery, recovery and streaming replication + will be terminated once all clients have disconnected. <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 diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index fd84d67f51e..cb76b1d7b57 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.433 2010/03/21 00:43:40 momjian Exp $ --> +<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.434 2010/04/08 01:39:37 rhaas Exp $ --> <chapter Id="runtime"> <title>Server Setup and Operation</title> @@ -1338,7 +1338,9 @@ echo -17 > /proc/self/oom_adj until online backup mode is no longer active. While backup mode is active, new connections will still be allowed, but only to superusers (this exception allows a superuser to connect to terminate - online backup mode). + online backup mode). If the server is in recovery when a smart + shutdown is requested, recovery and streaming replication will be + stopped only after all regular sessions have terminated. </para> </listitem> </varlistentry> |