Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1ffdc03

Browse files
committed
Mention standby.signal in FATALs for checkpoint record missing at recovery
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
1 parent 96f0526 commit 1ffdc03

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/backend/access/transam/xlogrecovery.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -651,20 +651,20 @@ InitWalRecovery(ControlFileData *ControlFile, bool *wasShutdown_ptr,
651651
checkPoint.ThisTimeLineID))
652652
ereport(FATAL,
653653
(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"
655655
"If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"
656656
"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)));
658658
}
659659
}
660660
else
661661
{
662662
ereport(FATAL,
663663
(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"
665665
"If you are not restoring from a backup, try removing the file \"%s/backup_label\".\n"
666666
"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)));
668668
wasShutdown = false; /* keep compiler quiet */
669669
}
670670

0 commit comments

Comments
 (0)