Improve pg_upgrade's checks for required executables.

tglsfdc · tglsfdc · commit ee718c23105d · 2010-12-29T13:43:58.000-05:00
Don't insist on pg_dumpall and psql being present in the old cluster,
since they are not needed.  Do insist on pg_resetxlog being present
(in both old and new), since we need it.  Also check for pg_config,
but only in the new cluster.  Remove the useless attempt to call
pg_config in the old cluster; we don't need to know the old value of
--pkglibdir.  (In the case of a stripped-down migration installation
there might be nothing there to look at anyway, so any future change
that might reintroduce that need would have to be considered carefully.)

Per my attempts to build a minimal previous-version installation to support
pg_upgrade.
diff --git a/contrib/pg_upgrade/exec.c b/contrib/pg_upgrade/exec.c
@@ -14,7 +14,7 @@
 
 
 static void	check_data_dir(migratorContext *ctx, const char *pg_data);
-static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster);
+static void check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster);
 static int	check_exec(migratorContext *ctx, const char *dir, const char *cmdName);
 static const char *validate_exec(const char *path);
 
@@ -99,15 +99,15 @@ verify_directories(migratorContext *ctx)
 	check_ok(ctx);
 
 	prep_status(ctx, "Checking old bin directory (%s)", ctx->old.bindir);
-	check_bin_dir(ctx, &ctx->old);
+	check_bin_dir(ctx, &ctx->old, CLUSTER_OLD);
 	check_ok(ctx);
 
 	prep_status(ctx, "Checking new data directory (%s)", ctx->new.pgdata);
 	check_data_dir(ctx, ctx->new.pgdata);
 	check_ok(ctx);
 
 	prep_status(ctx, "Checking new bin directory (%s)", ctx->new.bindir);
-	check_bin_dir(ctx, &ctx->new);
+	check_bin_dir(ctx, &ctx->new, CLUSTER_NEW);
 	check_ok(ctx);
 }
 
@@ -158,12 +158,18 @@ check_data_dir(migratorContext *ctx, const char *pg_data)
  *	exit().
  */
 static void
-check_bin_dir(migratorContext *ctx, ClusterInfo *cluster)
+check_bin_dir(migratorContext *ctx, ClusterInfo *cluster, Cluster whichCluster)
 {
 	check_exec(ctx, cluster->bindir, "postgres");
-	check_exec(ctx, cluster->bindir, "psql");
 	check_exec(ctx, cluster->bindir, "pg_ctl");
-	check_exec(ctx, cluster->bindir, "pg_dumpall");
+	check_exec(ctx, cluster->bindir, "pg_resetxlog");
+	if (whichCluster == CLUSTER_NEW)
+	{
+		/* these are only needed in the new cluster */
+		check_exec(ctx, cluster->bindir, "pg_config");
+		check_exec(ctx, cluster->bindir, "psql");
+		check_exec(ctx, cluster->bindir, "pg_dumpall");
+	}
 }
 
 
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
@@ -308,7 +308,11 @@ validateDirectoryOption(migratorContext *ctx, char **dirpath,
 static void
 get_pkglibdirs(migratorContext *ctx)
 {
-	ctx->old.libpath = get_pkglibdir(ctx, ctx->old.bindir);
+	/*
+	 * we do not need to know the libpath in the old cluster, and might not
+	 * have a working pg_config to ask for it anyway.
+	 */
+	ctx->old.libpath = NULL;
 	ctx->new.libpath = get_pkglibdir(ctx, ctx->new.bindir);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,11 @@ validateDirectoryOption(migratorContext ctx, char *dirpath,`
`308`	`308`	`static void`
`309`	`309`	`get_pkglibdirs(migratorContext *ctx)`
`310`	`310`	`{`
`311`		`- ctx->old.libpath = get_pkglibdir(ctx, ctx->old.bindir);`
	`311`	`+ /*`
	`312`	`+ * we do not need to know the libpath in the old cluster, and might not`
	`313`	`+ * have a working pg_config to ask for it anyway.`
	`314`	`+ */`
	`315`	`+ ctx->old.libpath = NULL;`
`312`	`316`	`ctx->new.libpath = get_pkglibdir(ctx, ctx->new.bindir);`
`313`	`317`	`}`
`314`	`318`