diff options
| author | Bruce Momjian | 2012-12-01 03:32:19 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2012-12-01 03:32:25 +0000 |
| commit | 5eeab9c85cfd7d7ddda4d72ea8a4f03aa2a74969 (patch) | |
| tree | 8b19e8f1f1183dbbba4c7921a62dc5c154a35f95 | |
| parent | 113d25c4e6b1111113aa249640af0682f09c781a (diff) | |
In pg_upgrade, improve status wording now that we have per-database
status output for dump/restore.
| -rw-r--r-- | contrib/pg_upgrade/dump.c | 7 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/contrib/pg_upgrade/dump.c b/contrib/pg_upgrade/dump.c index d206e98be25..2c1b65b2552 100644 --- a/contrib/pg_upgrade/dump.c +++ b/contrib/pg_upgrade/dump.c @@ -18,9 +18,7 @@ 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, @@ -28,6 +26,9 @@ generate_old_dump(void) 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 index bdc6d133d09..c12f15b875b 100644 --- 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++) { |