NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit115a707

committed

Fix bogus logic for checking executables' versions within pg_upgrade.

Somebody messed up a refactoring here. As it stood, we'd check pg_ctl's--version output twice for each cluster. Worse, the first check for thenew cluster's version happened before we'd done any validate_exec checksthere, breaking the check ordering the code intended.A. AkentevaDiscussion:https://postgr.es/m/f9266a85d918a3cf3a386b5148aee666@postgrespro.ru

1 parent1772c5c commit115a707Copy full SHA for 115a707

File tree

1 file changed

-5

lines changed

src/bin/pg_upgrade
- exec.c

1 file changed

-5

lines changed

`‎src/bin/pg_upgrade/exec.c‎`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -382,12 +382,11 @@ check_bin_dir(ClusterInfo *cluster)`
`382`	`382`	`validate_exec(cluster->bindir,"pg_ctl");`
`383`	`383`
`384`	`384`	`/*`
`385`		`- * Fetch the binaryversions after checking for the existence of pg_ctl,`
`386`		`- *this gives a correct error if the binary useditselffor the version`
`387`		`- * fetching is broken.`
	`385`	`+ * Fetch the binaryversion after checking for the existence of pg_ctl.`
	`386`	`+ *This way we report a useful error if thepg_ctlbinary used for version`
	`387`	`+ * fetching ismissing/broken.`
`388`	`388`	`*/`
`389`		`-get_bin_version(&old_cluster);`
`390`		`-get_bin_version(&new_cluster);`
	`389`	`+get_bin_version(cluster);`
`391`	`390`
`392`	`391`	`/* pg_resetxlog has been renamed to pg_resetwal in version 10 */`
`393`	`392`	`if (GET_MAJOR_VERSION(cluster->bin_version)<1000)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit115a707

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/exec.c‎`

0 commit comments