Fix pg_upgrade's cross-version tests when old < 18

alvherre · alvherre · commit 38c18710b37a · 2024-11-13T11:06:44.000+01:00
Because in the 18 cycle we turned checksums on by default with commit 04bec89, and pg_upgrade fails if the setting doesn't match in old and new clusters, the built-in cross-version pg_upgrade test is failing if the old version is older than 18. Fix the script so that it creates the old cluster with checksums enabled (-k) in cross-version scenarios. This went unnoticed because the buildfarm doesn't use the same test code for cross-version testing. Reviewed-by: Peter Eisentraut <peter@eisentraut.org> Discussion: https://postgr.es/m/202411071838.7fgkb7uvavvz@alvherre.pgsql
diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -180,6 +180,10 @@ sub filter_dump
 	}
 }
 
+# Since checksums are now enabled by default, and weren't before 18,
+# pass '-k' to initdb on old versions so that upgrades work.
+push @initdb_params, '-k' if $oldnode->pg_version < 18;
+
 $node_params{extra} = \@initdb_params;
 $oldnode->init(%node_params);
 $oldnode->start;

Original file line number	Diff line number	Diff line change
`@@ -180,6 +180,10 @@ sub filter_dump`
`180`	`180`	`}`
`181`	`181`	`}`
`182`	`182`
	`183`	`+# Since checksums are now enabled by default, and weren't before 18,`
	`184`	`+# pass '-k' to initdb on old versions so that upgrades work.`
	`185`	`+push @initdb_params, '-k' if $oldnode->pg_version < 18;`
	`186`	`+`
`183`	`187`	`$node_params{extra} = \@initdb_params;`
`184`	`188`	`$oldnode->init(%node_params);`
`185`	`189`	`$oldnode->start;`