diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_upgrade/check.c | 2 | ||||
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 4 | ||||
| -rw-r--r-- | contrib/pg_upgrade/server.c | 22 |
3 files changed, 16 insertions, 12 deletions
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c index d1dc5dbeaac..415f95b616d 100644 --- a/contrib/pg_upgrade/check.c +++ b/contrib/pg_upgrade/check.c @@ -264,7 +264,7 @@ check_cluster_compatibility(bool live_check) /* Is it 9.0 but without tablespace directories? */ if (GET_MAJOR_VERSION(new_cluster.major_version) == 900 && - new_cluster.controldata.cat_ver < TABLE_SPACE_SUBDIRS) + new_cluster.controldata.cat_ver < TABLE_SPACE_SUBDIRS_CAT_VER) pg_log(PG_FATAL, "This utility can only upgrade to PostgreSQL version 9.0 after 2010-01-11\n" "because of backend API changes made during development.\n"); } diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index 5ca570eb157..5865315d9e4 100644 --- a/contrib/pg_upgrade/pg_upgrade.h +++ b/contrib/pg_upgrade/pg_upgrade.h @@ -58,7 +58,9 @@ #define atooid(x) ((Oid) strtoul((x), NULL, 10)) /* OID system catalog preservation added during PG 9.0 development */ -#define TABLE_SPACE_SUBDIRS 201001111 +#define TABLE_SPACE_SUBDIRS_CAT_VER 201001111 +/* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */ +#define BINARY_UPGRADE_SERVER_FLAG_CAT_VER 201104251 /* * Each relation is represented by a relinfo structure. diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index 2a0f50eb2a2..ab8d8c73342 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -173,6 +173,11 @@ start_postmaster(ClusterInfo *cluster, bool quiet) const char *datadir; unsigned short port; bool exit_hook_registered = false; +#ifndef WIN32 + char *output_filename = log_opts.filename; +#else + char *output_filename = DEVNULL; +#endif bindir = cluster->bindir; datadir = cluster->pgdata; @@ -193,7 +198,6 @@ start_postmaster(ClusterInfo *cluster, bool quiet) * same file because we get the error: "The process cannot access the file * because it is being used by another process." so we have to send all * other output to 'nul'. - * * Using autovacuum=off disables cleanup vacuum and analyze, but freeze * vacuums can still happen, so we set autovacuum_freeze_max_age to its * maximum. We assume all datfrozenxid and relfrozen values are less than @@ -202,15 +206,13 @@ start_postmaster(ClusterInfo *cluster, bool quiet) */ snprintf(cmd, sizeof(cmd), SYSTEMQUOTE "\"%s/pg_ctl\" -l \"%s\" -D \"%s\" " - "-o \"-p %d -c autovacuum=off " - "-c autovacuum_freeze_max_age=2000000000\" " - "start >> \"%s\" 2>&1" SYSTEMQUOTE, - bindir, -#ifndef WIN32 - log_opts.filename, datadir, port, log_opts.filename); -#else - DEVNULL, datadir, port, DEVNULL); -#endif + "-o \"-p %d %s\" start >> \"%s\" 2>&1" SYSTEMQUOTE, + bindir, output_filename, datadir, port, + (cluster->controldata.cat_ver >= + BINARY_UPGRADE_SERVER_FLAG_CAT_VER) ? "-b" : + "-c autovacuum=off -c autovacuum_freeze_max_age=2000000000", + log_opts.filename); + exec_prog(true, "%s", cmd); /* wait for the server to start properly */ |