Mention standby.signal in FATALs for checkpoint record missing at recovery

michaelpq · michaelpq · commit 1ffdc03c21ae · 2023-10-30T13:56:02.000+09:00
When beginning recovery from a base backup by reading a backup_label file, it may be possible that no checkpoint record is available depending on the method used when the case backup was taken, which would prevent recovery from beginning. In this case, the FATAL messages issued, initially added by c900c15, mentioned recovery.signal as an option to do recovery but not standby.signal. Let's add it as an available option, for clarity. Per suggestion from Bowen Shi, extracted from a larger patch by me. Author: Michael Paquier Discussion: https://postgr.es/m/CAM_vCudkSjr7NsNKSdjwtfAm9dbzepY6beZ5DP177POKy8=2aw@mail.gmail.com
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
@@ -651,20 +651,20 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr,
 								checkPoint.ThisTimeLineID))
 					ereport(FATAL,
 							(errmsg("could not find redo location referenced by checkpoint record"),
-							 errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" and add required recovery options.\n"
+							 errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
 									 "If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"
 									 "Be careful: removing \"%s/backup_label\" will result in a corrupt cluster if restoring from a backup.",
-									 DataDir, DataDir, DataDir)));
+									 DataDir, DataDir, DataDir, DataDir)));
 			}
 		}
 		else
 		{
 			ereport(FATAL,
 					(errmsg("could not locate required checkpoint record"),
-					 errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" and add required recovery options.\n"
+					 errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"
 							 "If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"
 							 "Be careful: removing \"%s/backup_label\" will result in a corrupt cluster if restoring from a backup.",
-							 DataDir, DataDir, DataDir)));
+							 DataDir, DataDir, DataDir, DataDir)));
 			wasShutdown = false;	/* keep compiler quiet */
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -651,20 +651,20 @@ InitWalRecovery(ControlFileData ControlFile, bool wasShutdown_ptr,`
`651`	`651`	`checkPoint.ThisTimeLineID))`
`652`	`652`	`ereport(FATAL,`
`653`	`653`	`(errmsg("could not find redo location referenced by checkpoint record"),`
`654`		`- errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" and add required recovery options.\n"`
	`654`	`+ errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"`
`655`	`655`	`"If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"`
`656`	`656`	`"Be careful: removing \"%s/backup_label\" will result in a corrupt cluster if restoring from a backup.",`
`657`		`- DataDir, DataDir, DataDir)));`
	`657`	`+ DataDir, DataDir, DataDir, DataDir)));`
`658`	`658`	`}`
`659`	`659`	`}`
`660`	`660`	`else`
`661`	`661`	`{`
`662`	`662`	`ereport(FATAL,`
`663`	`663`	`(errmsg("could not locate required checkpoint record"),`
`664`		`- errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" and add required recovery options.\n"`
	`664`	`+ errhint("If you are restoring from a backup, touch \"%s/recovery.signal\" or \"%s/standby.signal\" and add required recovery options.\n"`
`665`	`665`	`"If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"`
`666`	`666`	`"Be careful: removing \"%s/backup_label\" will result in a corrupt cluster if restoring from a backup.",`
`667`		`- DataDir, DataDir, DataDir)));`
	`667`	`+ DataDir, DataDir, DataDir, DataDir)));`
`668`	`668`	`wasShutdown = false; /* keep compiler quiet */`
`669`	`669`	`}`
`670`	`670`