database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-14 08:21:07 +03:00
Code Activity

Fix bogus logic for checking executables' versions within pg_upgrade.

Browse Source 
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 the
new cluster's version happened before we'd done any validate_exec checks
there, breaking the check ordering the code intended.

A. Akenteva

Discussion: https://postgr.es/m/f9266a85d918a3cf3a386b5148aee666@postgrespro.ru
This commit is contained in:
Tom Lane
2017-11-09 11:30:30 -05:00
parent 1772c5c6ee
commit 115a707563
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/pg_upgrade/exec.c
View File

@ -382,12 +382,11 @@ check_bin_dir(ClusterInfo *cluster)
validate_exec(cluster->bindir, "pg_ctl"); validate_exec(cluster->bindir, "pg_ctl");
/* /*
* Fetch the binary versions after checking for the existence of pg_ctl, * Fetch the binary version after checking for the existence of pg_ctl.
* this gives a correct error if the binary used itself for the version * This way we report a useful error if the pg_ctl binary used for version
* fetching is broken. * fetching is missing/broken.
*/ */
get_bin_version(&old_cluster); get_bin_version(cluster);
get_bin_version(&new_cluster);
/* pg_resetxlog has been renamed to pg_resetwal in version 10 */ /* pg_resetxlog has been renamed to pg_resetwal in version 10 */
if (GET_MAJOR_VERSION(cluster->bin_version) < 1000) if (GET_MAJOR_VERSION(cluster->bin_version) < 1000)