summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas2009-02-23 08:45:48 +0000
committerHeikki Linnakangas2009-02-23 08:46:26 +0000
commite63b4d08f2acf9f1d5efcd04ed99334b8ddcf626 (patch)
treeedbdbeaf70a550fe5f92183a09d53308f3f6e017
parentc675ccde27065db5371e64eae1ba4f35358aaa1c (diff)
Clear FatalError when we start up. Comment enhancements
-rw-r--r--src/backend/postmaster/postmaster.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 0a06632922..575223ad4e 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -225,7 +225,7 @@ static pid_t StartupPID = 0,
static int Shutdown = NoShutdown;
static bool FatalError = false; /* T if recovering from backend crash */
-static bool RecoveryError = false; /* T if recovery failed */
+static bool RecoveryError = false; /* T if WAL recovery failed */
/*
* We use a simple state machine to control startup, shutdown, and
@@ -244,8 +244,8 @@ static bool RecoveryError = false; /* T if recovery failed */
* could start accepting connections to perform read-only queries at this
* point, if we had the infrastructure to do that.
*
- * When the WAL redo is finished, the startup process exits with exit code 0
- * and we switch to PM_RUN state. The startup process can also skip the
+ * When WAL redo is finished, the startup process exits with exit code 0
+ * and we switch to PM_RUN state. Startup process can also skip the
* recovery and consistent recovery phases altogether, as it will during
* normal startup when there's no recovery to be done, for example.
*
@@ -2193,6 +2193,7 @@ reaper(SIGNAL_ARGS)
/*
* Startup succeeded, commence normal operations
*/
+ FatalError = false;
pmState = PM_RUN;
/*