From: Jesper Pedersen <jesper.pedersen@redhat.com>
To: fabriziomello@gmail.com
Cc: Jamison, Kirk <k.jamison@jp.fujitsu.com>
Cc: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Alvaro Herrera <alvherre@2ndquadrant.com>
Cc: Michael Paquier <michael@paquier.xyz>
Cc: Peter Eisentraut <peter.eisentraut@2ndquadrant.com>
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: Mon, 28 Jan 2019 11:47:37 -0500
Message-ID: <4ce565f9-d21f-039f-8f5a-2e16e6aa1ae4@redhat.com> (raw)
In-Reply-To: <CAFcNs+qCPbzErgcmTDqW2qzkt7kzarjWqD48VimKD4mXM0nutA@mail.gmail.com>
References: <11b6b108-6ac0-79a6-785a-f13dfe60ab92@redhat.com>
<ba90295e-9734-07bc-3453-bfa878948478@2ndquadrant.com>
<2dc5eaeb-e60d-2a16-696e-7b4d3d3548cb@redhat.com>
<59f9323a-fee8-88f6-16ab-2319149b00be@2ndquadrant.com>
<5b7d95ba-8920-357d-1ec6-1084ce34a9e6@redhat.com>
<D09B13F772D2274BB348A310EE3027C64137E4@g01jpexmbkw24>
<c448acf6-7c38-3d6d-c663-5387ccffb906@redhat.com>
<D09B13F772D2274BB348A310EE3027C6413F1A@g01jpexmbkw24>
<388de5bc-858b-4686-d2e5-d0b21981dd72@redhat.com>
<CAFcNs+qCPbzErgcmTDqW2qzkt7kzarjWqD48VimKD4mXM0nutA@mail.gmail.com>
On 1/28/19 11:30 AM, FabrÃzio de Royes Mello wrote:
> IMHO you should use long option name '--jobs' like others.
>
Thanks for your feedback !
Done, and v4 attached.
Best regards,
Jesper
Attachments:v4_0001-Highlight-that-the-jobs-option-isn-t-passed-down-to-.patch (text/x-patch, 3.2K) download
From 142b4723f433f39d0eed2ced4beccc3721451103 Mon Sep 17 00:00:00 2001
From: jesperpedersen <jesper.pedersen@redhat.com>
Date: Fri, 21 Dec 2018 05:05:31 -0500
Subject: [PATCH] Highlight that the --jobs option isn't passed down to
vacuumdb by default.
Author: Jesper Pedersen <jesper.pedersen@redhat.com>
---
doc/src/sgml/ref/pgupgrade.sgml | 6 +++++-
src/bin/pg_upgrade/check.c | 28 ++++++++++++++++++++++------
2 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgmlindex 7e1afaf0a5..b1da0cc7a2 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 by default.+ 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 such as <option>--jobs</option>.
</para>
<para>
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.cindex fc5aa7010f..3b478ef95f 100644--- a/src/bin/pg_upgrade/check.c+++ b/src/bin/pg_upgrade/check.c@@ -495,15 +495,31 @@ create_script_for_cluster_analyze(char **analyze_script_file_name)
ECHO_QUOTE, ECHO_QUOTE);
fprintf(script, "echo %sthis script and run:%s\n",
ECHO_QUOTE, ECHO_QUOTE);
- fprintf(script, "echo %s \"%s/vacuumdb\" %s--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);+ if (user_opts.jobs <= 1 || GET_MAJOR_VERSION(new_cluster.major_version) < 905)+ {+ fprintf(script, "echo %s \"%s/vacuumdb\" %s--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);+ }+ else+ {+ fprintf(script, "echo %s \"%s/vacuumdb\" %s--jobs %d --all %s%s\n", ECHO_QUOTE,+ new_cluster.bindir, user_specification.data, user_opts.jobs,+ /* Did we copy the free space files? */+ (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?+ "--analyze-only" : "--analyze", ECHO_QUOTE);+ }
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, fabriziomello@gmail.com, k.jamison@jp.fujitsu.com, tgl@sss.pgh.pa.us, alvherre@2ndquadrant.com, michael@paquier.xyz, peter.eisentraut@2ndquadrant.com, pgsql-hackers@lists.postgresql.org, bruce@momjian.us
Subject: Re: pg_upgrade: Pass -j down to vacuumdb
In-Reply-To: <4ce565f9-d21f-039f-8f5a-2e16e6aa1ae4@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