diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2016-07-26 11:23:43 -0400 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2016-09-21 12:00:00 -0400 |
| commit | c1dc51d4844e2a37412b034c07c1c5a439ba0b9d (patch) | |
| tree | 5da243eb19c5c9d494958a61165a3fbf87974963 /src/backend/utils/misc/pg_controldata.c | |
| parent | eb5089a05ba0852cc3eafea53c5d23e7633fca81 (diff) | |
pg_ctl: Detect current standby state from pg_control
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>
Diffstat (limited to 'src/backend/utils/misc/pg_controldata.c')
| -rw-r--r-- | src/backend/utils/misc/pg_controldata.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c index 34ee76a237e..4f9de830974 100644 --- a/src/backend/utils/misc/pg_controldata.c +++ b/src/backend/utils/misc/pg_controldata.c @@ -52,6 +52,9 @@ pg_control_system(PG_FUNCTION_ARGS) /* read the control file */ ControlFile = get_controlfile(DataDir, NULL); + if (!ControlFile) + ereport(ERROR, + (errmsg("calculated CRC checksum does not match value stored in file"))); values[0] = Int32GetDatum(ControlFile->pg_control_version); nulls[0] = false; @@ -128,6 +131,9 @@ pg_control_checkpoint(PG_FUNCTION_ARGS) /* Read the control file. */ ControlFile = get_controlfile(DataDir, NULL); + if (!ControlFile) + ereport(ERROR, + (errmsg("calculated CRC checksum does not match value stored in file"))); /* * Calculate name of the WAL file containing the latest checkpoint's REDO @@ -230,6 +236,9 @@ pg_control_recovery(PG_FUNCTION_ARGS) /* read the control file */ ControlFile = get_controlfile(DataDir, NULL); + if (!ControlFile) + ereport(ERROR, + (errmsg("calculated CRC checksum does not match value stored in file"))); values[0] = LSNGetDatum(ControlFile->minRecoveryPoint); nulls[0] = false; @@ -295,6 +304,9 @@ pg_control_init(PG_FUNCTION_ARGS) /* read the control file */ ControlFile = get_controlfile(DataDir, NULL); + if (!ControlFile) + ereport(ERROR, + (errmsg("calculated CRC checksum does not match value stored in file"))); values[0] = Int32GetDatum(ControlFile->maxAlign); nulls[0] = false; |