In pg_upgrade, improve status wording now that we have per-database

bmomjian · bmomjian · commit 5eeab9c85cfd · 2012-11-30T22:32:25.000-05:00
status output for dump/restore.
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c
@@ -18,16 +18,17 @@ generate_old_dump(void)
 {
 	int			dbnum;
 
-	prep_status("Creating catalog dump\n");
-
-	pg_log(PG_REPORT, OVERWRITE_MESSAGE, "global objects");
+	prep_status("Creating dump of global objects");
 
 	/* run new pg_dumpall binary for globals */
 	exec_prog(UTILITY_LOG_FILE, NULL, true,
 			  "\"%s/pg_dumpall\" %s --schema-only --globals-only --binary-upgrade %s -f %s",
 			  new_cluster.bindir, cluster_conn_opts(&old_cluster),
 			  log_opts.verbose ? "--verbose" : "",
 			  GLOBALS_DUMP_FILE);
+	check_ok();
+
+	prep_status("Creating dump of database schemas\n");
 
  	/* create per-db dump files */
 	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
@@ -248,7 +248,7 @@ prepare_new_databases(void)
 
 	set_frozenxids();
 
-	prep_status("Creating databases in the new cluster");
+	prep_status("Restoring global objects in the new cluster");
 
 	/*
 	 * Install support functions in the global-object restore database to
@@ -297,7 +297,7 @@ create_new_objects(void)
 	}
 	check_ok();
 
-	prep_status("Restoring database schema to new cluster\n");
+	prep_status("Restoring database schemas in the new cluster\n");
 
 	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
 	{

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ prepare_new_databases(void)`
`248`	`248`
`249`	`249`	`set_frozenxids();`
`250`	`250`
`251`		`- prep_status("Creating databases in the new cluster");`
	`251`	`+ prep_status("Restoring global objects in the new cluster");`
`252`	`252`
`253`	`253`	`/*`
`254`	`254`	`* Install support functions in the global-object restore database to`
`@@ -297,7 +297,7 @@ create_new_objects(void)`
`297`	`297`	`}`
`298`	`298`	`check_ok();`
`299`	`299`
`300`		`- prep_status("Restoring database schema to new cluster\n");`
	`300`	`+ prep_status("Restoring database schemas in the new cluster\n");`
`301`	`301`
`302`	`302`	`for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)`
`303`	`303`	`{`