From: Jesper Pedersen <jesper.pedersen@redhat.com>
To: Robert Haas <robertmhaas@gmail.com>
To: Jamison, Kirk <k.jamison@jp.fujitsu.com>
Cc: Alvaro Herrera <alvherre@2ndquadrant.com>
Cc: Michael Paquier <michael@paquier.xyz>
Cc: Peter Eisentraut <peter.eisentraut@2ndquadrant.com>
Cc: fabriziomello@gmail.com <fabriziomello@gmail.com>
Cc: Tom Lane <tgl@sss.pgh.pa.us>
Cc: pgsql-hackers@lists.postgresql.org <pgsql-hackers@lists.postgresql.org>
Cc: Bruce Momjian <bruce@momjian.us>
Subject: Re: pg_upgrade: Pass -j down to vacuumdb
Date: Tue, 12 Mar 2019 16:24:01 -0400
Message-ID: <03845f77-49e7-4569-7062-8ee1fb460ec2@redhat.com> (raw)
In-Reply-To: <CA+TgmobMGTfkMY-isz4pLw_bfywVOqTUDcW+obeAfYSeTBJM7A@mail.gmail.com>
References: <201902010958.cf2cbi3d2ule@alvherre.pgsql>
<bef52417-2416-cb97-afce-a351601eab43@redhat.com>
<D09B13F772D2274BB348A310EE3027C64659E9@g01jpexmbkw24>
<CA+TgmobMGTfkMY-isz4pLw_bfywVOqTUDcW+obeAfYSeTBJM7A@mail.gmail.com>
Hi,
Thanks Kirk !
On 3/12/19 2:20 PM, Robert Haas wrote:
> The words 'by default' should be removed here, because there is also
> no non-default way to get that behavior, either.
>
Here is v9 based on Kirk's and your input.
Best regards,
Jesper
Attachments:v9_0001-Highlight-that-the-jobs-option-isn-t-passed-down-to-.patch (text/x-patch, 3.5K) download
From 5b879f79300412638705e32aa3ed51aff3cbe75c Mon Sep 17 00:00:00 2001
From: jesperpedersen <jesper.pedersen@redhat.com>
Date: Tue, 12 Mar 2019 16:02:27 -0400
Subject: [PATCH] Highlight that the --jobs option isn't passed down to
vacuumdb.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: Jesper Pedersen and Kirk Jamison
Reviewed-by: Peter Eisentraut, Jerry Sievers, Michael Paquier, Tom Lane, Fabrízio de Royes Mello, Álvaro Herrera and Robert Haas
Discussion: https://www.postgresql.org/message-id/flat/11b6b108-6ac0-79a6-785a-f13dfe60ab92@redhat.com
---
doc/src/sgml/ref/pgupgrade.sgml | 6 +++++-
src/bin/pg_upgrade/check.c | 23 +++++++++++++++++++----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgmlindex 7e1afaf0a5..5f2a94918d 100644--- a/doc/src/sgml/ref/pgupgrade.sgml+++ b/doc/src/sgml/ref/pgupgrade.sgml@@ -395,7 +395,11 @@ NET STOP postgresql-&majorversion;
in parallel; a good place to start is the maximum of the number of
CPU cores and tablespaces. This option can dramatically reduce the
time to upgrade a multi-database server running on a multiprocessor
- machine.+ machine. Note that this option isn't passed to the+ <application>vacuumdb</application> application.+ The system environment variable <literal>VACUUMDB_OPTS</literal> can be+ used to pass extra options to the <application>vacuumdb</application>+ application during the script execution.
</para>
<para>
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.cindex fc5aa7010f..e4356f011c 100644--- a/src/bin/pg_upgrade/check.c+++ b/src/bin/pg_upgrade/check.c@@ -493,17 +493,32 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
fprintf(script, "echo %sIf you would like default statistics as quickly as possible, cancel%s\n",
ECHO_QUOTE, ECHO_QUOTE);
- fprintf(script, "echo %sthis script and run:%s\n",+ fprintf(script, "echo %sthis script. You may add optional vacuumdb options (e.g. --jobs)%s\n",
ECHO_QUOTE, ECHO_QUOTE);
- fprintf(script, "echo %s \"%s/vacuumdb\" %s--all %s%s\n", ECHO_QUOTE,+ fprintf(script, "echo %sby editing $VACUUMDB_OPTS, then run the command below.%s\n",+ ECHO_QUOTE, ECHO_QUOTE);+#ifndef WIN32+ fprintf(script, "echo %s \"%s/vacuumdb\" %s $VACUUMDB_OPTS --all %s%s\n", ECHO_QUOTE,
new_cluster.bindir, user_specification.data,
- /* Did we copy the free space files? */+ /* Did we copy the free space files? */
(GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
"--analyze-only" : "--analyze", ECHO_QUOTE);
+#else+ fprintf(script, "echo %s \"%s\\vacuumdb.exe\" %s %%VACUUMDB_OPTS%% --all %s%s\n", ECHO_QUOTE,+ new_cluster.bindir, user_specification.data,+ /* Did we copy the free space files? */+ (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?+ "--analyze-only" : "--analyze", ECHO_QUOTE);+#endif
fprintf(script, "echo%s\n\n", ECHO_BLANK);
- fprintf(script, "\"%s/vacuumdb\" %s--all --analyze-in-stages\n",+#ifndef WIN32+ fprintf(script, "\"%s/vacuumdb\" %s $VACUUMDB_OPTS --all --analyze-in-stages\n",
new_cluster.bindir, user_specification.data);
+#else+ fprintf(script, "\"%s\\vacuumdb.exe\" %s %%VACUUMDB_OPTS%% --all --analyze-in-stages\n",+ new_cluster.bindir, user_specification.data);+#endif
/* Did we copy the free space files? */
if (GET_MAJOR_VERSION(old_cluster.major_version) < 804)
fprintf(script, "\"%s/vacuumdb\" %s--all\n", new_cluster.bindir,
--
2.17.2
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-hackers@postgresql.org
Cc: jesper.pedersen@redhat.com, robertmhaas@gmail.com, k.jamison@jp.fujitsu.com, alvherre@2ndquadrant.com, michael@paquier.xyz, peter.eisentraut@2ndquadrant.com, fabriziomello@gmail.com, tgl@sss.pgh.pa.us, pgsql-hackers@lists.postgresql.org, bruce@momjian.us
Subject: Re: pg_upgrade: Pass -j down to vacuumdb
In-Reply-To: <03845f77-49e7-4569-7062-8ee1fb460ec2@redhat.com>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox