Commit0befb4f

committed

pg_upgrade: Check all used executables

Expand the validate_exec() calls to cover all the used binaries.Author: Daniel Gustafsson <daniel@yesql.se>Reviewed-by: Peter Eisentraut <peter.eisentraut@2ndquadrant.com>Discussion:https://www.postgresql.org/message-id/flat/9328.1552952117@sss.pgh.pa.us

1 parent28cb055 commit0befb4fCopy full SHA for 0befb4f

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 11 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -376,6 +376,7 @@ check_bin_dir(ClusterInfo *cluster)`
`376`	`376`	`cluster->bindir);`
`377`	`377`
`378`	`378`	`validate_exec(cluster->bindir,"postgres");`
	`379`	`+validate_exec(cluster->bindir,"pg_controldata");`
`379`	`380`	`validate_exec(cluster->bindir,"pg_ctl");`
`380`	`381`
`381`	`382`	`/*`
`@@ -390,12 +391,20 @@ check_bin_dir(ClusterInfo *cluster)`
`390`	`391`	`validate_exec(cluster->bindir,"pg_resetxlog");`
`391`	`392`	`else`
`392`	`393`	`validate_exec(cluster->bindir,"pg_resetwal");`
	`394`	`+`
`393`	`395`	`if (cluster==&new_cluster)`
`394`	`396`	`{`
`395`		`-/* these are only needed in the new cluster */`
`396`		`-validate_exec(cluster->bindir,"psql");`
	`397`	`+/*`
	`398`	`+ * These binaries are only needed for the target version. pg_dump and`
	`399`	`+ * pg_dumpall are used to dump the old cluster, but must be of the`
	`400`	`+ * target version.`
	`401`	`+ */`
	`402`	`+validate_exec(cluster->bindir,"initdb");`
`397`	`403`	`validate_exec(cluster->bindir,"pg_dump");`
`398`	`404`	`validate_exec(cluster->bindir,"pg_dumpall");`
	`405`	`+validate_exec(cluster->bindir,"pg_restore");`
	`406`	`+validate_exec(cluster->bindir,"psql");`
	`407`	`+validate_exec(cluster->bindir,"vacuumdb");`
`399`	`408`	`}`
`400`	`409`	`}`
`401`	`410`

Comments

(0)