Improve pg_upgrade error report

bmomjian · bmomjian · commit 600250d0ed88 · 2013-01-18T09:26:55.000-05:00
If the cluster alignments don't match, output this suggestion:

	Likely one cluster is a 32-bit install, the other 64-bit
diff --git a/contrib/pg_upgrade/controldata.c b/contrib/pg_upgrade/controldata.c
@@ -502,7 +502,8 @@ check_control_data(ControlData *oldctrl,
 {
 	if (oldctrl->align == 0 || oldctrl->align != newctrl->align)
 		pg_log(PG_FATAL,
-			   "old and new pg_controldata alignments are invalid or do not match\n");
+			   "old and new pg_controldata alignments are invalid or do not match\n"
+			   "Likely one cluster is a 32-bit install, the other 64-bit\n");
 
 	if (oldctrl->blocksz == 0 || oldctrl->blocksz != newctrl->blocksz)
 		pg_log(PG_FATAL,

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,8 @@ check_control_data(ControlData *oldctrl,`
`502`	`502`	`{`
`503`	`503`	`if (oldctrl->align == 0 \|\| oldctrl->align != newctrl->align)`
`504`	`504`	`pg_log(PG_FATAL,`
`505`		`- "old and new pg_controldata alignments are invalid or do not match\n");`
	`505`	`+ "old and new pg_controldata alignments are invalid or do not match\n"`
	`506`	`+ "Likely one cluster is a 32-bit install, the other 64-bit\n");`
506	`507`
`507`	`508`	`if (oldctrl->blocksz == 0 \|\| oldctrl->blocksz != newctrl->blocksz)`
`508`	`509`	`pg_log(PG_FATAL,`