pg_upgrade: improve checksum mismatch error message

bmomjian · bmomjian · commit dc01efa5ccdd · 2015-02-11T22:22:26.000-05:00
Patch by Greg Sabino Mullane, slight adjustments by me
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
@@ -572,10 +572,14 @@ check_control_data(ControlData *oldctrl,
 	 * We might eventually allow upgrades from checksum to no-checksum
 	 * clusters.
 	 */
-	if (oldctrl->data_checksum_version != newctrl->data_checksum_version)
-	{
-		pg_fatal("old and new pg_controldata checksum versions are invalid or do not match\n");
-	}
+	if (oldctrl->data_checksum_version == 0 &&
+		newctrl->data_checksum_version != 0)
+		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");
 }
 
 
