database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

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

Browse Source 
status output for dump/restore.
This commit is contained in:
Bruce Momjian
2012-11-30 22:32:19 -05:00
parent 113d25c4e6
commit 5eeab9c85c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/pg_upgrade/dump.c
View File

@ -18,9 +18,7 @@ generate_old_dump(void)
{ {
int dbnum; int dbnum;
prep_status("Creating catalog dump\n"); prep_status("Creating dump of global objects");
pg_log(PG_REPORT, OVERWRITE_MESSAGE, "global objects");
/* run new pg_dumpall binary for globals */ /* run new pg_dumpall binary for globals */
exec_prog(UTILITY_LOG_FILE, NULL, true, exec_prog(UTILITY_LOG_FILE, NULL, true,
@ -28,6 +26,9 @@ generate_old_dump(void)
new_cluster.bindir, cluster_conn_opts(&old_cluster), new_cluster.bindir, cluster_conn_opts(&old_cluster),
log_opts.verbose ? "--verbose" : "", log_opts.verbose ? "--verbose" : "",
GLOBALS_DUMP_FILE); GLOBALS_DUMP_FILE);
check_ok();
prep_status("Creating dump of database schemas\n");
/* create per-db dump files */ /* create per-db dump files */
for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++) for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)

4
contrib/pg_upgrade/pg_upgrade.c
View File

@ -248,7 +248,7 @@ prepare_new_databases(void)
set_frozenxids(); 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 * Install support functions in the global-object restore database to
@ -297,7 +297,7 @@ create_new_objects(void)
} }
check_ok(); 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++) for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
{ {