Date: Wed, 26 Feb 2020 10:48:44 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Dagfinn Ilmari =?iso-8859-1?Q?Manns=E5ker?= <ilmari@ilmari.org>
Cc: Daniel Gustafsson <daniel@yesql.se>, pgsql-hackers@lists.postgresql.org
Subject: Re: [PATCH] pg_upgrade: report the reason for failing to open the
 cluster version file
Message-ID: <20200226014844.GF17153@paquier.xyz>
References: <87pne2w98h.fsf@wibble.ilmari.org>
 <44115C15-EE49-4BDE-A976-2901384B5E60@yesql.se>
 <87mu96w7c5.fsf@wibble.ilmari.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="JcvBIhDvR6w3jUPA"
Content-Disposition: inline
In-Reply-To: <87mu96w7c5.fsf@wibble.ilmari.org>
Precedence: bulk


--JcvBIhDvR6w3jUPA
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Feb 25, 2020 at 11:55:06PM +0000, Dagfinn Ilmari Manns=E5ker wrote:
> @@ -164,11 +164,11 @@ get_major_server_version(ClusterInfo *cluster)
>  	snprintf(ver_filename, sizeof(ver_filename), "%s/PG_VERSION",
>  			 cluster->pgdata);
>  	if ((version_fd =3D fopen(ver_filename, "r")) =3D=3D NULL)
> -		pg_fatal("could not open version file: %s\n", ver_filename);
> +		pg_fatal("could not open version file \"%s\": %m\n", ver_filename);

Here I think that it would be better to just use "could not open
file" as we know that we are dealing with a version file already
thanks to ver_filename.

>  	if (fscanf(version_fd, "%63s", cluster->major_version_str) =3D=3D 0 ||
>  		sscanf(cluster->major_version_str, "%d.%d", &v1, &v2) < 1)
> -		pg_fatal("could not parse PG_VERSION file from %s\n", cluster->pgdata);
> +		pg_fatal("could not parse PG_VERSION file from \"%s\"\n", cluster->pgd=
ata);
> =20
>  	fclose(version_fd);

No objection to this one.
--
Michael

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

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

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAl5VznwACgkQnvQgOdby
QH2Qdw//XLAK7bSVgtoyCjNxUsFLjEaU6HhKaYyG4zmOIybciSzDU+02xe4glde5
XVMozr6F0D1Fc44jXm55v0PnVpuVrxUmm0r+Qm6CLC0s8mv1akwvqnXxplvbSkO8
tK35QINxQFOk7kNS7SNw7kO3jRQUSzipY/mv9MJwcA8z83PUEPVKPDaeDKX9C/6o
F+jgmKCcvWlGfsazGOQoAdFulw/sWD09uvIXipncxbsvm1Iu6iDYXlE83nhHUqFT
3+LOuHY/69vkmbuWBXULCflbFSa0TUI8vBfQ4PAmuRzmUTAi9CRsTVgQHkzdKxZg
9nUNfqfTeVFAZeQx60cp5T9IgadOlH0u3B7IPMasQhxvuvAeiyf3RXhKreBpqpD+
N87wRqdUfNQZyHrwYm04WgbihwMFQEIS7UhJga5I98ci3J4+LampCskF03/PWjCL
3SCgEbqfDQhpYbl79IOQHl39xXjQG0fnxpFck0oyLzH+vs++p50Q77pb8gu6Bw+k
EDH2qJHqzAY7KEsT5STMpK93M14CfQhTBZ5mz5cXCekIzRgPkTI57puaFYRIqgl9
nXrbDjk7uuC7ZRQGpmpPJxJ1E+UEoCjlt6lBl7PrWU441TWYM6RucLB9PcZgOxO8
vKU9v1E3PWLga1jS04+Y7fV+wNhrxOGdOWcAffooAEmE3A7LR5s=
=pxK2
-----END PGP SIGNATURE-----

--JcvBIhDvR6w3jUPA--