We now accept read-only connections in state PM_RECOVERY_CONSISTENT.

robertmhaas · robertmhaas · commit a724584735db · 2010-05-14T18:08:33.000Z
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.606 2010/04/28 16:10:42 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.607 2010/05/14 18:08:33 rhaas Exp $
  *
  * NOTES
  *
@@ -238,14 +238,12 @@ static bool RecoveryError = false;		/* T if WAL recovery failed */
  *
  * When the startup process is ready to start archive recovery, it signals the
  * postmaster, and we switch to PM_RECOVERY state. The background writer is
- * launched, while the startup process continues applying WAL.
- * After reaching a consistent point in WAL redo, startup process signals
- * us again, and we switch to PM_RECOVERY_CONSISTENT state. There's currently
- * no difference between PM_RECOVERY and PM_RECOVERY_CONSISTENT, but we
- * could start accepting connections to perform read-only queries at this
- * point, if we had the infrastructure to do that.
- * When archive recovery is finished, the startup process exits with exit
- * code 0 and we switch to PM_RUN state.
+ * launched, while the startup process continues applying WAL.  If Hot Standby
+ * is enabled, then, after reaching a consistent point in WAL redo, startup
+ * process signals us again, and we switch to PM_RECOVERY_CONSISTENT state and
+ * begin accepting connections to perform read-only queries.  When archive
+ * recovery is finished, the startup process exits with exit code 0 and we
+ * switch to PM_RUN state.
  *
  * Normal child backends can only be launched when we are in PM_RUN or
  * PM_RECOVERY_CONSISTENT state.  (We also allow launch of normal

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.606 2010/04/28 16:10:42 heikki Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.607 2010/05/14 18:08:33 rhaas Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -238,14 +238,12 @@ static bool RecoveryError = false; /* T if WAL recovery failed */`
`238`	`238`	`*`
`239`	`239`	`* When the startup process is ready to start archive recovery, it signals the`
`240`	`240`	`* postmaster, and we switch to PM_RECOVERY state. The background writer is`
`241`		`- * launched, while the startup process continues applying WAL.`
`242`		`- * After reaching a consistent point in WAL redo, startup process signals`
`243`		`- * us again, and we switch to PM_RECOVERY_CONSISTENT state. There's currently`
`244`		`- * no difference between PM_RECOVERY and PM_RECOVERY_CONSISTENT, but we`
`245`		`- * could start accepting connections to perform read-only queries at this`
`246`		`- * point, if we had the infrastructure to do that.`
`247`		`- * When archive recovery is finished, the startup process exits with exit`
`248`		`- * code 0 and we switch to PM_RUN state.`
	`241`	`+ * launched, while the startup process continues applying WAL. If Hot Standby`
	`242`	`+ * is enabled, then, after reaching a consistent point in WAL redo, startup`
	`243`	`+ * process signals us again, and we switch to PM_RECOVERY_CONSISTENT state and`
	`244`	`+ * begin accepting connections to perform read-only queries. When archive`
	`245`	`+ * recovery is finished, the startup process exits with exit code 0 and we`
	`246`	`+ * switch to PM_RUN state.`
`249`	`247`	`*`
`250`	`248`	`* Normal child backends can only be launched when we are in PM_RUN or`
`251`	`249`	`* PM_RECOVERY_CONSISTENT state. (We also allow launch of normal`