]> granicus.if.org Git - postgresql/commitdiff
Unbreak postmaster restart-after-crash sequence
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Wed, 3 Jul 2013 15:04:21 +0000 (11:04 -0400)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Wed, 3 Jul 2013 15:08:52 +0000 (11:08 -0400)
In patch 82233ce7ea42, AbortStartTime wasn't being reset appropriately
after the restart sequence, causing subsequent iterations through
ServerLoop to malfunction.

src/backend/postmaster/postmaster.c

index 64467cb53ca829d362e8890a971ef42b52035aed..15fd4c90eaae1f056b8943bb1471eb1dd8d2aee4 100644 (file)
@@ -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,