database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

pg_ctl: Detect current standby state from pg_control

Browse Source 
pg_ctl used to determine whether a server was in standby mode by looking
for a recovery.conf file.  With this change, it instead looks into
pg_control, which is potentially more accurate.  There are also
occasional discussions about removing recovery.conf, so this removes one
dependency.

Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
This commit is contained in:
Peter Eisentraut
2016-07-26 11:23:43 -04:00
parent eb5089a05b
commit c1dc51d484
5 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/common/controldata_utils.c
View File

@@ -33,9 +33,11 @@
*
* Get controlfile values. The caller is responsible
* for pfreeing the result.
*
* Returns NULL if the CRC did not match.
*/
ControlFileData *
get_controlfile(char *DataDir, const char *progname)
get_controlfile(const char *DataDir, const char *progname)
{
ControlFileData *ControlFile;
int fd;
@@ -82,13 +84,10 @@ get_controlfile(char *DataDir, const char *progname)
FIN_CRC32C(crc);
if (!EQ_CRC32C(crc, ControlFile->crc))
#ifndef FRONTEND
elog(ERROR, _("calculated CRC checksum does not match value stored in file"));
#else
printf(_("WARNING: Calculated CRC checksum does not match value stored in file.\n"
"Either the file is corrupt, or it has a different layout than this program\n"
"is expecting. The results below are untrustworthy.\n\n"));
#endif
{
pfree(ControlFile);
return NULL;
}
/* Make sure the control file is valid byte order. */
if (ControlFile->pg_control_version % 65536 == 0 &&