Date: Fri, 5 Oct 2018 12:16:03 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Masahiko Sawada <sawada.mshk@gmail.com>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, Alvaro Herrera <alvherre@2ndquadrant.com>,
	Sergei Kornilov <sk@zsrv.org>, nasbyj@amazon.com,
	Andres Freund <andres@anarazel.de>,
	Robert Haas <robertmhaas@gmail.com>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Subject: Re: pgsql: Improve autovacuum logging for aggressive and
 anti-wraparound ru
Message-ID: <20181005031603.GF1629@paquier.xyz>
References: <23209391537822541@iva4-6d7004ac8463.qloud-c.yandex.net>
 <20180924211117.tpwxemzd3372nagj@alvherre.pgsql>
 <CAD21AoAV17jQH6__E8_VQePms4NptX0X50U=98qJ5RNV7au1iw@mail.gmail.com>
 <20181002001151.GP11712@paquier.xyz>
 <CAD21AoB-nhVxo=6__BeukNniHnt6UGMKRs3v=Zkn-WJq9kx+4A@mail.gmail.com>
 <20181002065508.GC17642@paquier.xyz>
 <338.1538489728@sss.pgh.pa.us>
 <CAD21AoBR+y31ps+=G6_fxxVd_o1itTnaK19sDAEhAP_RyVT2AA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="VkqCAaSJIySsbD6j"
Content-Disposition: inline
In-Reply-To: 
 <CAD21AoBR+y31ps+=G6_fxxVd_o1itTnaK19sDAEhAP_RyVT2AA@mail.gmail.com>
Precedence: bulk


--VkqCAaSJIySsbD6j
Content-Type: multipart/mixed; boundary="zGQnqpIoxlsbsOfg"
Content-Disposition: inline


--zGQnqpIoxlsbsOfg
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Oct 03, 2018 at 04:37:29PM +0900, Masahiko Sawada wrote:
> Thank you for the comment. Attached the updated patch.

So, I have come back to this stuff, and finished with the attached
instead, so as the assertion is in a single place.  I find that
clearer.  The comments have also been improved.  Thoughts?
--
Michael

--zGQnqpIoxlsbsOfg
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="fix_autovacuum_log_v3.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuu=
mlazy.c
index 8996d366e9..e73b548ac3 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -249,6 +249,10 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumPa=
rams *params,
 	if (options & VACOPT_DISABLE_PAGE_SKIPPING)
 		aggressive =3D true;
=20
+	/* vacuum preventing wraparound must be aggressive */
+	Assert((params->is_wraparound && aggressive) ||
+		   !params->is_wraparound);
+
 	vacrelstats =3D (LVRelStats *) palloc0(sizeof(LVRelStats));
=20
 	vacrelstats->old_rel_pages =3D onerel->rd_rel->relpages;
@@ -376,10 +380,8 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumPa=
rams *params,
 			initStringInfo(&buf);
 			if (params->is_wraparound)
 			{
-				if (aggressive)
-					msgfmt =3D _("automatic aggressive vacuum to prevent wraparound of ta=
ble \"%s.%s.%s\": index scans: %d\n");
-				else
-					msgfmt =3D _("automatic vacuum to prevent wraparound of table \"%s.%s=
=2E%s\": index scans: %d\n");
+				/* autovacuum preventing wraparound has to be aggressive */
+				msgfmt =3D _("automatic aggressive vacuum to prevent wraparound of tab=
le \"%s.%s.%s\": index scans: %d\n");
 			}
 			else
 			{

--zGQnqpIoxlsbsOfg--

--VkqCAaSJIySsbD6j
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAlu213MACgkQnvQgOdby
QH0+cQ//R7shS1cYc/y8Sh0Ndh5k4I3Fpa8aba/BXucqk/udXEpSHwcivPa3MTB0
QEa/mERF0TWjGNnVQfURyEm5KpRovPzHrMfwYKNMtB6O6Sm1aDRqMX5Dkr64n7jG
nDwv42ZmG5iPIabJ1kl13OkmcYUdXKrrI04i/WbeMHNNNuW8uxRMHyirYCUntqf6
UHz7DFelSoJsE5rXHGy8joHZesjRw//YCyLATrgCg/6uiBjGyJ9p+1XNVQF1heRt
WXGxFcuHJkQjMGwewr4sGRDlSXZI7PEqxHDFNFmh8ICDL1oHGquJzfvbkl2ykqGt
zyE3aLs6QdGk3JQrtbQpzDImJrSI5jatPgFaR/LNlDreFoJTr3/0OF1qfdjDK7hZ
n+trMBAR4W02Fq1bBBmwjk4ayk41iOilWg5l+4YK4bejKb9+vJQMMHeEVwktac2l
R6nTLz4qluhQeEnnRZCq4ggq+QfgZWguR8L0R+DJrXT+EyyDsTRwTg/3AFi3Pcrg
WVHxOmsKNNTh1ft01EeuDAvOsceExsMCmzK2SLHys1ZvfrFgsFkxFkW29akY+XhZ
BSA3RRjgYuaasaIFxOaFOFLqQ1JQSdHPbOraQDHHbPEKx5eqK/LG/z92TpyvQAJs
h0UWzSgIE2mrPFxsId2KSRidqiR/c6Z2+k+YrpRJGLQH4aU+/ZY=
=AlDz
-----END PGP SIGNATURE-----

--VkqCAaSJIySsbD6j--