X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=contrib%2Fpg_upgrade%2Foption.c;h=79b59ee17d25f7a3fd2d77b19d1d8374f681e036;hb=7e04792a1cbd1763edf72474f6b1fbad2cd0ad31;hp=d29aad0e1dd7797db96ec5c936ff29150b76612c;hpb=a88f4496b75a756df371a405ce608ceb06c8fbd7;p=postgresql diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c index d29aad0e1d..79b59ee17d 100644 --- a/contrib/pg_upgrade/option.c +++ b/contrib/pg_upgrade/option.c @@ -3,22 +3,29 @@ * * options functions * - * Copyright (c) 2010-2011, PostgreSQL Global Development Group + * Copyright (c) 2010-2014, PostgreSQL Global Development Group * contrib/pg_upgrade/option.c */ -#include "pg_upgrade.h" +#include "postgres_fe.h" + +#include "miscadmin.h" -#include "getopt_long.h" +#include "pg_upgrade.h" +#include +#include +#include +#include #ifdef WIN32 #include #endif static void usage(void); -static void check_required_directory(char **dirpath, +static void check_required_directory(char **dirpath, char **configpath, char *envVarName, char *cmdLineOption, char *description); +#define FIX_DEFAULT_READ_ONLY "-c default_transaction_read_only=false" UserOpts user_opts; @@ -37,21 +44,25 @@ parseCommandLine(int argc, char *argv[]) {"new-datadir", required_argument, NULL, 'D'}, {"old-bindir", required_argument, NULL, 'b'}, {"new-bindir", required_argument, NULL, 'B'}, + {"old-options", required_argument, NULL, 'o'}, + {"new-options", required_argument, NULL, 'O'}, {"old-port", required_argument, NULL, 'p'}, {"new-port", required_argument, NULL, 'P'}, - {"user", required_argument, NULL, 'u'}, + {"username", required_argument, NULL, 'U'}, {"check", no_argument, NULL, 'c'}, - {"debug", no_argument, NULL, 'g'}, - {"debugfile", required_argument, NULL, 'G'}, {"link", no_argument, NULL, 'k'}, - {"logfile", required_argument, NULL, 'l'}, + {"retain", no_argument, NULL, 'r'}, + {"jobs", required_argument, NULL, 'j'}, {"verbose", no_argument, NULL, 'v'}, {NULL, 0, NULL, 0} }; int option; /* Command line option */ int optindex = 0; /* used by getopt_long */ int os_user_effective_id; + FILE *fp; + char **filename; + time_t run_time = time(NULL); user_opts.transfer_mode = TRANSFER_MODE_COPY; @@ -72,8 +83,7 @@ parseCommandLine(int argc, char *argv[]) if (argc > 1) { - if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-h") == 0 || - strcmp(argv[1], "-?") == 0) + if (strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") == 0) { usage(); exit(0); @@ -87,11 +97,12 @@ parseCommandLine(int argc, char *argv[]) /* Allow help and version to be run as root, so do the test here. */ if (os_user_effective_id == 0) - pg_log(PG_FATAL, "%s: cannot be run as root\n", os_info.progname); + pg_fatal("%s: cannot be run as root\n", os_info.progname); - getcwd(os_info.cwd, MAXPGPATH); + if ((log_opts.internal = fopen_priv(INTERNAL_LOG_FILE, "a")) == NULL) + pg_fatal("cannot write to log file %s\n", INTERNAL_LOG_FILE); - while ((option = getopt_long(argc, argv, "d:D:b:B:cgG:kl:p:P:u:v", + while ((option = getopt_long(argc, argv, "d:D:b:B:cj:ko:O:p:P:rU:v", long_options, &optindex)) != -1) { switch (option) @@ -110,37 +121,39 @@ parseCommandLine(int argc, char *argv[]) case 'd': old_cluster.pgdata = pg_strdup(optarg); + old_cluster.pgconfig = pg_strdup(optarg); break; case 'D': new_cluster.pgdata = pg_strdup(optarg); + new_cluster.pgconfig = pg_strdup(optarg); break; - case 'g': - pg_log(PG_REPORT, "Running in debug mode\n"); - log_opts.debug = true; - break; - - case 'G': - if ((log_opts.debug_fd = fopen(optarg, "w")) == NULL) - { - pg_log(PG_FATAL, "cannot open debug file\n"); - exit(1); - } + case 'j': + user_opts.jobs = atoi(optarg); break; case 'k': user_opts.transfer_mode = TRANSFER_MODE_LINK; break; - case 'l': - log_opts.filename = pg_strdup(optarg); + case 'o': + old_cluster.pgopts = pg_strdup(optarg); break; + case 'O': + new_cluster.pgopts = pg_strdup(optarg); + break; + + /* + * Someday, the port number option could be removed and passed + * using -o/-O, but that requires postmaster -C to be + * supported on all old/new versions. + */ case 'p': if ((old_cluster.port = atoi(optarg)) <= 0) { - pg_log(PG_FATAL, "invalid old port number\n"); + pg_fatal("invalid old port number\n"); exit(1); } break; @@ -148,14 +161,19 @@ parseCommandLine(int argc, char *argv[]) case 'P': if ((new_cluster.port = atoi(optarg)) <= 0) { - pg_log(PG_FATAL, "invalid new port number\n"); + pg_fatal("invalid new port number\n"); exit(1); } break; - case 'u': + case 'r': + log_opts.retain = true; + break; + + case 'U': pg_free(os_info.user); os_info.user = pg_strdup(optarg); + os_info.user_specified = true; /* * Push the user name into the environment so pre-9.1 @@ -170,47 +188,47 @@ parseCommandLine(int argc, char *argv[]) break; default: - pg_log(PG_FATAL, - "Try \"%s --help\" for more information.\n", + pg_fatal("Try \"%s --help\" for more information.\n", os_info.progname); break; } } - if (log_opts.filename != NULL) + /* label start of upgrade in logfiles */ + for (filename = output_files; *filename != NULL; filename++) { - /* - * We must use append mode so output generated by child processes via - * ">>" will not be overwritten, and we want the file truncated on - * start. - */ - /* truncate */ - if ((log_opts.fd = fopen(log_opts.filename, "w")) == NULL) - pg_log(PG_FATAL, "cannot write to log file %s\n", log_opts.filename); - fclose(log_opts.fd); - if ((log_opts.fd = fopen(log_opts.filename, "a")) == NULL) - pg_log(PG_FATAL, "cannot write to log file %s\n", log_opts.filename); + if ((fp = fopen_priv(*filename, "a")) == NULL) + pg_fatal("cannot write to log file %s\n", *filename); + + /* Start with newline because we might be appending to a file. */ + fprintf(fp, "\n" + "-----------------------------------------------------------------\n" + " pg_upgrade run on %s" + "-----------------------------------------------------------------\n\n", + ctime(&run_time)); + fclose(fp); } - else - log_opts.filename = strdup(DEVNULL); - /* if no debug file name, output to the terminal */ - if (log_opts.debug && !log_opts.debug_fd) + /* Turn off read-only mode; add prefix to PGOPTIONS? */ + if (getenv("PGOPTIONS")) { - log_opts.debug_fd = fopen(DEVTTY, "w"); - if (!log_opts.debug_fd) - pg_log(PG_FATAL, "cannot write to terminal\n"); + char *pgoptions = psprintf("%s %s", FIX_DEFAULT_READ_ONLY, + getenv("PGOPTIONS")); + pg_putenv("PGOPTIONS", pgoptions); + pfree(pgoptions); } + else + pg_putenv("PGOPTIONS", FIX_DEFAULT_READ_ONLY); /* Get values from env if not already set */ - check_required_directory(&old_cluster.bindir, "PGBINOLD", "-b", - "old cluster binaries reside"); - check_required_directory(&new_cluster.bindir, "PGBINNEW", "-B", - "new cluster binaries reside"); - check_required_directory(&old_cluster.pgdata, "PGDATAOLD", "-d", - "old cluster data resides"); - check_required_directory(&new_cluster.pgdata, "PGDATANEW", "-D", - "new cluster data resides"); + check_required_directory(&old_cluster.bindir, NULL, "PGBINOLD", "-b", + "old cluster binaries reside"); + check_required_directory(&new_cluster.bindir, NULL, "PGBINNEW", "-B", + "new cluster binaries reside"); + check_required_directory(&old_cluster.pgdata, &old_cluster.pgconfig, + "PGDATAOLD", "-d", "old cluster data resides"); + check_required_directory(&new_cluster.pgdata, &new_cluster.pgconfig, + "PGDATANEW", "-D", "new cluster data resides"); } @@ -219,24 +237,25 @@ usage(void) { printf(_("pg_upgrade upgrades a PostgreSQL cluster to a different major version.\n\ \nUsage:\n\ - pg_upgrade [OPTIONS]...\n\ + pg_upgrade [OPTION]...\n\ \n\ Options:\n\ - -b, --old-bindir=OLDBINDIR old cluster executable directory\n\ - -B, --new-bindir=NEWBINDIR new cluster executable directory\n\ + -b, --old-bindir=BINDIR old cluster executable directory\n\ + -B, --new-bindir=BINDIR new cluster executable directory\n\ -c, --check check clusters only, don't change any data\n\ - -d, --old-datadir=OLDDATADIR old cluster data directory\n\ - -D, --new-datadir=NEWDATADIR new cluster data directory\n\ - -g, --debug enable debugging\n\ - -G, --debugfile=FILENAME output debugging activity to file\n\ + -d, --old-datadir=DATADIR old cluster data directory\n\ + -D, --new-datadir=DATADIR new cluster data directory\n\ + -j, --jobs number of simultaneous processes or threads to use\n\ -k, --link link instead of copying files to new cluster\n\ - -l, --logfile=FILENAME log session activity to file\n\ - -p, --old-port=OLDPORT old cluster port number (default %d)\n\ - -P, --new-port=NEWPORT new cluster port number (default %d)\n\ - -u, --user=NAME clusters superuser (default \"%s\")\n\ - -v, --verbose enable verbose output\n\ + -o, --old-options=OPTIONS old cluster options to pass to the server\n\ + -O, --new-options=OPTIONS new cluster options to pass to the server\n\ + -p, --old-port=PORT old cluster port number (default %d)\n\ + -P, --new-port=PORT new cluster port number (default %d)\n\ + -r, --retain retain SQL and log files after success\n\ + -U, --username=NAME cluster superuser (default \"%s\")\n\ + -v, --verbose enable verbose internal logging\n\ -V, --version display version information, then exit\n\ - -h, --help show this help, then exit\n\ + -?, --help show this help, then exit\n\ \n\ Before running pg_upgrade you must:\n\ create a new database cluster (using the new version of initdb)\n\ @@ -244,10 +263,10 @@ Before running pg_upgrade you must:\n\ shutdown the postmaster servicing the new cluster\n\ \n\ When you run pg_upgrade, you must provide the following information:\n\ - the data directory for the old cluster (-d OLDDATADIR)\n\ - the data directory for the new cluster (-D NEWDATADIR)\n\ - the \"bin\" directory for the old version (-b OLDBINDIR)\n\ - the \"bin\" directory for the new version (-B NEWBINDIR)\n\ + the data directory for the old cluster (-d DATADIR)\n\ + the data directory for the new cluster (-D DATADIR)\n\ + the \"bin\" directory for the old version (-b BINDIR)\n\ + the \"bin\" directory for the new version (-B BINDIR)\n\ \n\ For example:\n\ pg_upgrade -d oldCluster/data -D newCluster/data -b oldCluster/bin -B newCluster/bin\n\ @@ -276,6 +295,7 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user); * * Checks a directory option. * dirpath - the directory name supplied on the command line + * configpath - optional configuration directory * envVarName - the name of an environment variable to get if dirpath is NULL * cmdLineOption - the command line option corresponds to this directory (-o, -O, -n, -N) * description - a description of this directory option @@ -284,23 +304,29 @@ or\n"), old_cluster.port, new_cluster.port, os_info.user); * user hasn't provided the required directory name. */ static void -check_required_directory(char **dirpath, char *envVarName, - char *cmdLineOption, char *description) +check_required_directory(char **dirpath, char **configpath, + char *envVarName, char *cmdLineOption, + char *description) { if (*dirpath == NULL || strlen(*dirpath) == 0) { const char *envVar; if ((envVar = getenv(envVarName)) && strlen(envVar)) + { *dirpath = pg_strdup(envVar); + if (configpath) + *configpath = pg_strdup(envVar); + } else - pg_log(PG_FATAL, "You must identify the directory where the %s\n" - "Please use the %s command-line option or the %s environment variable\n", + pg_fatal("You must identify the directory where the %s.\n" + "Please use the %s command-line option or the %s environment variable.\n", description, cmdLineOption, envVarName); } /* - * Trim off any trailing path separators + * Trim off any trailing path separators because we construct paths by + * appending to this path. */ #ifndef WIN32 if ((*dirpath)[strlen(*dirpath) - 1] == '/') @@ -310,3 +336,144 @@ check_required_directory(char **dirpath, char *envVarName, #endif (*dirpath)[strlen(*dirpath) - 1] = 0; } + +/* + * adjust_data_dir + * + * If a configuration-only directory was specified, find the real data dir + * by quering the running server. This has limited checking because we + * can't check for a running server because we can't find postmaster.pid. + */ +void +adjust_data_dir(ClusterInfo *cluster) +{ + char filename[MAXPGPATH]; + char cmd[MAXPGPATH], + cmd_output[MAX_STRING]; + FILE *fp, + *output; + + /* If there is no postgresql.conf, it can't be a config-only dir */ + snprintf(filename, sizeof(filename), "%s/postgresql.conf", cluster->pgconfig); + if ((fp = fopen(filename, "r")) == NULL) + return; + fclose(fp); + + /* If PG_VERSION exists, it can't be a config-only dir */ + snprintf(filename, sizeof(filename), "%s/PG_VERSION", cluster->pgconfig); + if ((fp = fopen(filename, "r")) != NULL) + { + fclose(fp); + return; + } + + /* Must be a configuration directory, so find the real data directory. */ + + prep_status("Finding the real data directory for the %s cluster", + CLUSTER_NAME(cluster)); + + /* + * We don't have a data directory yet, so we can't check the PG version, + * so this might fail --- only works for PG 9.2+. If this fails, + * pg_upgrade will fail anyway because the data files will not be found. + */ + snprintf(cmd, sizeof(cmd), "\"%s/postmaster\" -D \"%s\" -C data_directory", + cluster->bindir, cluster->pgconfig); + + if ((output = popen(cmd, "r")) == NULL || + fgets(cmd_output, sizeof(cmd_output), output) == NULL) + pg_fatal("Could not get data directory using %s: %s\n", + cmd, getErrorText(errno)); + + pclose(output); + + /* Remove trailing newline */ + if (strchr(cmd_output, '\n') != NULL) + *strchr(cmd_output, '\n') = '\0'; + + cluster->pgdata = pg_strdup(cmd_output); + + check_ok(); +} + + +/* + * get_sock_dir + * + * Identify the socket directory to use for this cluster. If we're doing + * a live check (old cluster only), we need to find out where the postmaster + * is listening. Otherwise, we're going to put the socket into the current + * directory. + */ +void +get_sock_dir(ClusterInfo *cluster, bool live_check) +{ +#ifdef HAVE_UNIX_SOCKETS + + /* + * sockdir and port were added to postmaster.pid in PG 9.1. Pre-9.1 cannot + * process pg_ctl -w for sockets in non-default locations. + */ + if (GET_MAJOR_VERSION(cluster->major_version) >= 901) + { + if (!live_check) + { + /* Use the current directory for the socket */ + cluster->sockdir = pg_malloc(MAXPGPATH); + if (!getcwd(cluster->sockdir, MAXPGPATH)) + pg_fatal("cannot find current directory\n"); + } + else + { + /* + * If we are doing a live check, we will use the old cluster's + * Unix domain socket directory so we can connect to the live + * server. + */ + unsigned short orig_port = cluster->port; + char filename[MAXPGPATH], + line[MAXPGPATH]; + FILE *fp; + int lineno; + + snprintf(filename, sizeof(filename), "%s/postmaster.pid", + cluster->pgdata); + if ((fp = fopen(filename, "r")) == NULL) + pg_fatal("Cannot open file %s: %m\n", filename); + + for (lineno = 1; + lineno <= Max(LOCK_FILE_LINE_PORT, LOCK_FILE_LINE_SOCKET_DIR); + lineno++) + { + if (fgets(line, sizeof(line), fp) == NULL) + pg_fatal("Cannot read line %d from %s: %m\n", lineno, filename); + + /* potentially overwrite user-supplied value */ + if (lineno == LOCK_FILE_LINE_PORT) + sscanf(line, "%hu", &old_cluster.port); + if (lineno == LOCK_FILE_LINE_SOCKET_DIR) + { + cluster->sockdir = pg_malloc(MAXPGPATH); + /* strip off newline */ + sscanf(line, "%s\n", cluster->sockdir); + } + } + fclose(fp); + + /* warn of port number correction */ + if (orig_port != DEF_PGUPORT && old_cluster.port != orig_port) + pg_log(PG_WARNING, "User-supplied old port number %hu corrected to %hu\n", + orig_port, cluster->port); + } + } + else + + /* + * Can't get sockdir and pg_ctl -w can't use a non-default, use + * default + */ + cluster->sockdir = NULL; +#else /* !HAVE_UNIX_SOCKETS */ + cluster->sockdir = NULL; +#endif +}