Commita0c8514

committed

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 rightfullyhappen if recovery stops at recovery target.

1 parentea964a4 commita0c8514Copy full SHA for a0c8514

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6611,12 +6611,11 @@ StartupXLOG(void)`
`6611`	`6611`	`}`
`6612`	`6612`
`6613`	`6613`	`/*`
`6614`		`- *If we launched aWAL receiver,it should be gone by now. It will trump`
`6615`		`- *overthe startup checkpointand subsequent records if it's still alive,`
`6616`		`- *so be extra sure thatit'sgone.`
	`6614`	`+ *KillWAL receiver,if it's still running, before we continue to write`
	`6615`	`+ * the startup checkpointrecord. It will trump over the checkpoint and`
	`6616`	`+ *subsequent records ifit'sstill alive when we start writing WAL.`
`6617`	`6617`	`*/`
`6618`		`-if (WalRcvInProgress())`
`6619`		`-elog(PANIC,"wal receiver still active");`
	`6618`	`+ShutdownWalRcv();`
`6620`	`6619`
`6621`	`6620`	`/*`
`6622`	`6621`	`* We don't need the latch anymore. It's not strictly necessary to disown`

Comments

(0)