database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

pg_upgrade: improve checksum mismatch error message

Browse Source 
Patch by Greg Sabino Mullane, slight adjustments by me
This commit is contained in:
Bruce Momjian
2015-02-11 22:22:26 -05:00
parent 056764b102
commit dc01efa5cc
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/pg_upgrade/controldata.c
View File

@@ -572,10 +572,14 @@ check_control_data(ControlData *oldctrl,
* We might eventually allow upgrades from checksum to no-checksum * We might eventually allow upgrades from checksum to no-checksum
* clusters. * clusters.
*/ */
if (oldctrl->data_checksum_version != newctrl->data_checksum_version) if (oldctrl->data_checksum_version == 0 &&
{ newctrl->data_checksum_version != 0)
pg_fatal("old and new pg_controldata checksum versions are invalid or do not match\n"); pg_fatal("old cluster does not use data checksums but the new one does\n");
} else if (oldctrl->data_checksum_version != 0 &&
newctrl->data_checksum_version == 0)
pg_fatal("old cluster uses data checksums but the new one does not\n");
else if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
pg_fatal("old and new cluster pg_controldata checksum versions do not match\n");
} }