Allow HotStandbyActiveInReplay() to be called in single user mode.

anarazel · anarazel · commit 0db10d4e92b6 · 2015-06-08T14:09:46.000+02:00
HotStandbyActiveInReplay, introduced in 061b079, only allowed WAL replay to happen in the startup process, missing the single user case. This buglet is fairly harmless as it only causes problems when single user mode in an assertion enabled build is used to replay a btree vacuum record. Backpatch to 9.2. 061b079 was backpatched further, but the assertion was not.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7575,7 +7575,7 @@ HotStandbyActive(void)
 bool
 HotStandbyActiveInReplay(void)
 {
-	Assert(AmStartupProcess());
+	Assert(AmStartupProcess() || !IsPostmasterEnvironment);
 	return LocalHotStandbyActive;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -7575,7 +7575,7 @@ HotStandbyActive(void)`
`7575`	`7575`	`bool`
`7576`	`7576`	`HotStandbyActiveInReplay(void)`
`7577`	`7577`	`{`
`7578`		`- Assert(AmStartupProcess());`
	`7578`	`+ Assert(AmStartupProcess() \|\| !IsPostmasterEnvironment);`
`7579`	`7579`	`return LocalHotStandbyActive;`
`7580`	`7580`	`}`
`7581`	`7581`