aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2013-07-03 11:04:21 -0400
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2013-07-03 11:08:52 -0400
commit620935ad088d4779ed7fa65f38a876b30e01dee4 (patch)
tree89687c1bb981ccd44cc9ef054c14a632c742d5bf /src
parent00a7767fcc2e4d90e3b4cacb87974ec5a0f32b8c (diff)
downloadpostgresql-620935ad088d4779ed7fa65f38a876b30e01dee4.tar.gz
postgresql-620935ad088d4779ed7fa65f38a876b30e01dee4.zip
Unbreak postmaster restart-after-crash sequence
In patch 82233ce7ea42, AbortStartTime wasn't being reset appropriately after the restart sequence, causing subsequent iterations through ServerLoop to malfunction.
Diffstat (limited to 'src')
-rw-r--r--src/backend/postmaster/postmaster.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 64467cb53ca..15fd4c90eaa 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -2594,6 +2594,7 @@ reaper(SIGNAL_ARGS)
* Startup succeeded, commence normal operations
*/
FatalError = false;
+ AbortStartTime = 0;
ReachedNormalRunning = true;
pmState = PM_RUN;
@@ -4711,6 +4712,7 @@ sigusr1_handler(SIGNAL_ARGS)
{
/* WAL redo has started. We're out of reinitialization. */
FatalError = false;
+ AbortStartTime = 0;
/*
* Crank up the background tasks. It doesn't matter if this fails,