From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 11 May 2011 09:46:08 +0000 (+0300)
Subject: Shut down WAL receiver if it's still running at end of recovery. We used to
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a0c8514149de92d48a8cf0f1a1458486851980a4;p=pg-rex%2Fsyncrep.git

Shut down WAL receiver if it's still running at end of recovery. We used to
just check that it's not running and PANIC if it was, but that can rightfully
happen if recovery stops at recovery target.
---

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index b0e4c41d6f..e71090f71b 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -6611,12 +6611,11 @@ StartupXLOG(void)
 	}
 
 	/*
-	 * If we launched a WAL receiver, it should be gone by now. It will trump
-	 * over the startup checkpoint and subsequent records if it's still alive,
-	 * so be extra sure that it's gone.
+	 * Kill WAL receiver, if it's still running, before we continue to write
+	 * the startup checkpoint record. It will trump over the checkpoint and
+	 * subsequent records if it's still alive when we start writing WAL.
 	 */
-	if (WalRcvInProgress())
-		elog(PANIC, "wal receiver still active");
+	ShutdownWalRcv();
 
 	/*
 	 * We don't need the latch anymore. It's not strictly necessary to disown