Commitfbc56f7

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 parentf71b5c7 commitfbc56f7Copy full SHA for fbc56f7

File tree

-5

lines changed

-5

lines changed

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6289,12 +6289,11 @@ StartupXLOG(void)`
`6289`	`6289`	`}`
`6290`	`6290`
`6291`	`6291`	`/*`
`6292`		`- *If we launched aWAL receiver,it should be gone by now. It will trump`
`6293`		`- *overthe startup checkpointand subsequent records if it's still alive,`
`6294`		`- *so be extra sure thatit'sgone.`
	`6292`	`+ *KillWAL receiver,if it's still running, before we continue to write`
	`6293`	`+ * the startup checkpointrecord. It will trump over the checkpoint and`
	`6294`	`+ *subsequent records ifit'sstill alive when we start writing WAL.`
`6295`	`6295`	`*/`
`6296`		`-if (WalRcvInProgress())`
`6297`		`-elog(PANIC, "wal receiver still active");`
	`6296`	`+ShutdownWalRcv();`
`6298`	`6297`
`6299`	`6298`	`/*`
`6300`	`6299`	`* We are now done reading the xlog from stream. Turn off streaming`

Comments

(0)