Feedback-ID: i0fe9450f:Fastmail
Date: Tue, 21 Feb 2023 08:43:06 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Cc: sawada.mshk@gmail.com, exclusion@gmail.com,
	pgsql-bugs@lists.postgresql.org
Subject: Re: BUG #17789: process_pgfdw_appname() fails for autovacuum workers
Message-ID: <Y/QFits/S6SHtMRL@paquier.xyz>
References: <17789-8b31c5a4672b74d9@postgresql.org>
 <20230214.140544.79456937383215325.horikyota.ntt@gmail.com>
 <CAD21AoArqZMZO71jPsO7HwtzKCykpW0Qvt3vSzjR+Qo0Gvx1bg@mail.gmail.com>
 <20230215.161254.1131534874642120926.horikyota.ntt@gmail.com>
 <Y/MoXUbuZty59gFj@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="7USJ4yJI6nSyAf+6"
Content-Disposition: inline
In-Reply-To: <Y/MoXUbuZty59gFj@paquier.xyz>
Archived-At: 
 <https://www.postgresql.org/message-id/Y/QFits/S6SHtMRL%40paquier.xyz>
Precedence: bulk


--7USJ4yJI6nSyAf+6
Content-Type: multipart/mixed; boundary="wSY1d2+jKMQgbY43"
Content-Disposition: inline


--wSY1d2+jKMQgbY43
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Feb 20, 2023 at 04:59:25PM +0900, Michael Paquier wrote:
> This has the advantage to be able to make the difference in both
> cases, which could be important for the end-user depending on the
> context where the code is run.

In short, as of the attached, which is pretty close to the original
patch.
--
Michael

--wSY1d2+jKMQgbY43
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="pgfdw-appname-michael.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 984e4d168a..a8040df07a 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -485,8 +485,6 @@ process_pgfdw_appname(const char *appname)
 	const char *p;
 	StringInfoData buf;
=20
-	Assert(MyProcPort !=3D NULL);
-
 	initStringInfo(&buf);
=20
 	for (p =3D appname; *p !=3D '\0'; p++)
@@ -522,13 +520,29 @@ process_pgfdw_appname(const char *appname)
 				appendStringInfoString(&buf, cluster_name);
 				break;
 			case 'd':
-				appendStringInfoString(&buf, MyProcPort->database_name);
+				if (MyProcPort)
+				{
+					const char *dbname =3D MyProcPort->database_name;
+
+					if (dbname)
+						appendStringInfoString(&buf, dbname);
+					else
+						appendStringInfoString(&buf, "[unknown]");
+				}
 				break;
 			case 'p':
 				appendStringInfo(&buf, "%d", MyProcPid);
 				break;
 			case 'u':
-				appendStringInfoString(&buf, MyProcPort->user_name);
+				if (MyProcPort)
+				{
+					const char *username =3D MyProcPort->user_name;
+
+					if (username)
+						appendStringInfoString(&buf, username);
+					else
+						appendStringInfoChar(&buf, "[unknown]");
+				}
 				break;
 			default:
 				/* format error - ignore it */

--wSY1d2+jKMQgbY43--

--7USJ4yJI6nSyAf+6
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmP0BYoACgkQnvQgOdby
QH3+Hg/+KfRbN5foGu8if54nsw7soOJJaT1wTuSxcjPnPYmUAXfmeuSH8Xq/z0cJ
qaWVXsnxoXFbJUFu1z58m/lzwFXE6E8KojMncwdGCWjEIDpDLu8BTNCZr6y4v8Ga
tNMVjrRTEnySS/GSNKA7/P73pluFJ/PmOfBvfUq62Y/FFpGVip5Xq8sLIKHm/wvy
C3vqu2plH3ai6HsAq3Hldzvn/+PC42kKBMliFS1qkZNYFHxAw8mcZtrhGcoFdXFF
nX3xJfXugHCxT0xPzKjbw4ibFl8HXJiCDrbZfjk32O9PsPhIXd05fhEv/vIPOpe2
dV/rJTsudp6BZp0FOqMXx1BoEFfEID/Fa+UrqKwk+MVVpm1MRkqkWSERr21UVQCy
LTbCrQSwBZ7dHj89jgvRd4qWPSitWmDQtLSwAITGwhJNIZnrgqpGKIHHje+SFv9l
2bdoiO4rVXOjOOjLRr5LQ3SDZ69IXAJULO+V6kvPGT0yvGiyjuTDlKjMNcGBGy6j
mVW8JJYLlX40+puteXkDZunh+fSC869o/3xwV+MalvFs5QGCfi5AR87ipEBhG/sn
tP5fe+YbQTWBHr8p6EAnXO0WJKe6GG/b9HkCKefFYQaAsDj3VUUMkg+QssuGCH7C
yEFfTkV4dbkvxrHlHNv/LffHMXbaGQinh1Rb1YAgopq29RnYNR4=
=LAGE
-----END PGP SIGNATURE-----

--7USJ4yJI6nSyAf+6--