Prevent intermittent hang in recovery from bgwriter interaction.

Startup process waited for cleanup lock but when hot_standby = off
the pid was not registered, so that the bgwriter would not wake
the waiting process as intended.

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 306ac058c365c15fd32deed7677aefe668bb6028..5a585f60d0bdb919513629f424cbcd78cc97d6c4 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -49,6 +49,7 @@
 #include "storage/latch.h"
 #include "storage/pmsignal.h"
 #include "storage/predicate.h"
+#include "storage/proc.h"
 #include "storage/procarray.h"
 #include "storage/reinit.h"
 #include "storage/smgr.h"
@@ -6406,6 +6407,7 @@ StartupXLOG(void)
                 */
                if (InArchiveRecovery && IsUnderPostmaster)
                {
+                       PublishStartupProcessInformation();
                        SetForwardFsyncRequests();
                        SendPostmasterSignal(PMSIGNAL_RECOVERY_STARTED);
                        bgwriterLaunched = true;

diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index a92ae4af590cdf06796c19553ac9d3ac0a8a6b27..2e71484126def7cbcf086c337a975936bd57982e 100644 (file)
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -68,11 +68,6 @@ InitRecoveryTransactionEnvironment(void)
         */
        SharedInvalBackendInit(true);
 
-       /*
-        * Record the PID and PGPROC structure of the startup process.
-        */
-       PublishStartupProcessInformation();
-
        /*
         * Lock a virtual transaction id for Startup process.
         *