From c0f72bb9f50a36bc158943f3a51fbbc749d7f93c Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 14 Dec 2022 07:52:58 +0100 Subject: [PATCH v2 1/2] pg_upgrade: Add --copy option This option selects the default transfer mode. Having an explicit option is handy to make scripts and tests more explicit. It also makes it easier to talk about a "copy" mode rather than "the default mode" or something like that, since until now the default mode didn't have an externally visible name. Discussion: https://www.postgresql.org/message-id/flat/50a97009-8ff9-ca4d-a0f6-6086a6775a5b%40enterprisedb.com --- doc/src/sgml/ref/pgupgrade.sgml | 10 ++++++++++ src/bin/pg_upgrade/option.c | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index 8f7a3025c3..7816b4c685 100644 --- a/doc/src/sgml/ref/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -230,6 +230,16 @@ Options + + + + + Copy files to the new cluster. This is the default. (See also + and .) + + + + diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c index 2939f584b4..51fc7aede0 100644 --- a/src/bin/pg_upgrade/option.c +++ b/src/bin/pg_upgrade/option.c @@ -56,6 +56,7 @@ parseCommandLine(int argc, char *argv[]) {"socketdir", required_argument, NULL, 's'}, {"verbose", no_argument, NULL, 'v'}, {"clone", no_argument, NULL, 1}, + {"copy", no_argument, NULL, 2}, {NULL, 0, NULL, 0} }; @@ -194,6 +195,10 @@ parseCommandLine(int argc, char *argv[]) user_opts.transfer_mode = TRANSFER_MODE_CLONE; break; + case 2: + user_opts.transfer_mode = TRANSFER_MODE_COPY; + break; + default: fprintf(stderr, _("Try \"%s --help\" for more information.\n"), os_info.progname); @@ -283,6 +288,7 @@ usage(void) printf(_(" -v, --verbose enable verbose internal logging\n")); printf(_(" -V, --version display version information, then exit\n")); printf(_(" --clone clone instead of copying files to new cluster\n")); + printf(_(" --copy copy files to new cluster (default)\n")); printf(_(" -?, --help show this help, then exit\n")); printf(_("\n" "Before running pg_upgrade you must:\n" base-commit: 60684dd834a222fefedd49b19d1f0a6189c1632e -- 2.38.1