Commitdc01efa

committed

pg_upgrade: improve checksum mismatch error message

Patch by Greg Sabino Mullane, slight adjustments by me

1 parent056764b commitdc01efaCopy full SHA for dc01efa

File tree

-4

lines changed

-4

lines changed

Lines changed: 8 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -572,10 +572,14 @@ check_control_data(ControlData *oldctrl,`
`572`	`572`	`* We might eventually allow upgrades from checksum to no-checksum`
`573`	`573`	`* clusters.`
`574`	`574`	`*/`
`575`		`-if (oldctrl->data_checksum_version!=newctrl->data_checksum_version)`
`576`		`-{`
`577`		`-pg_fatal("old and new pg_controldata checksum versions are invalid or do not match\n");`
`578`		`-}`
	`575`	`+if (oldctrl->data_checksum_version==0&&`
	`576`	`+newctrl->data_checksum_version!=0)`
	`577`	`+pg_fatal("old cluster does not use data checksums but the new one does\n");`
	`578`	`+elseif (oldctrl->data_checksum_version!=0&&`
	`579`	`+newctrl->data_checksum_version==0)`
	`580`	`+pg_fatal("old cluster uses data checksums but the new one does not\n");`
	`581`	`+elseif (oldctrl->data_checksum_version!=newctrl->data_checksum_version)`
	`582`	`+pg_fatal("old and new cluster pg_controldata checksum versions do not match\n");`
`579`	`583`	`}`
`580`	`584`
`581`	`585`

Comments

(0)