Date: Wed, 28 Jul 2021 12:18:12 +0900
From: Michael Paquier <michael@paquier.xyz>
To: Alvaro Herrera <alvherre@alvh.no-ip.org>
Cc: Fabien COELHO <coelho@cri.ensmp.fr>,
	Postgres hackers <pgsql-hackers@lists.postgresql.org>
Subject: Re: Some code cleanup for pgbench and pg_verifybackup
Message-ID: <YQDMdB+B68yePFeT@paquier.xyz>
References: <alpine.DEB.2.22.394.2107260946550.297424@pseudo>
 <202107261935.tad2ojwemn3v@alvherre.pgsql>
 <YP9LEHjcSng0Yk0R@paquier.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="rod2M7KjGuY22RMv"
Content-Disposition: inline
In-Reply-To: <YP9LEHjcSng0Yk0R@paquier.xyz>
Archived-At: 
 <https://www.postgresql.org/message-id/YQDMdB%2BB68yePFeT%40paquier.xyz>
Precedence: bulk


--rod2M7KjGuY22RMv
Content-Type: multipart/mixed; boundary="78Rq8kcczyyetN1b"
Content-Disposition: inline


--78Rq8kcczyyetN1b
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Jul 27, 2021 at 08:53:52AM +0900, Michael Paquier wrote:
> On Mon, Jul 26, 2021 at 03:35:29PM -0400, Alvaro Herrera wrote:
>> (In reality we cannot literally just exit(1) in pg_log_fatal(), because
>> there are quite a few places that do some other thing after the log
>> call and before exit(1), or terminate the program in some other way than
>> exit().)
>=20
> Yes, that's obviously wrong.  I am wondering if there is more of
> that.

I have been looking at that.  Here are some findings:
- In pg_archivecleanup, CleanupPriorWALFiles() does not bother
exit()'ing with an error code.  Shouldn't we worry about reporting
that correctly?  It seems strange to not inform users about paths that
would be broken, as that could bloat the archives without one knowing
about it.
- In pg_basebackup.c, ReceiveTarAndUnpackCopyChunk() would not
exit() when failing to change permissions for non-WIN32.
- pg_recvlogical is missing a failure handling for fstat(), as of
5c0de38.=20
- pg_verifybackup is in the wrong, as mentioned upthread.

Thoughts?  All that does not seem to enter into the category of things
worth back-patching, except for pg_verifybackup.
--
Michael

--78Rq8kcczyyetN1b
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="log-fatal-exit.patch"
Content-Transfer-Encoding: quoted-printable

diff --git a/src/bin/pg_archivecleanup/pg_archivecleanup.c b/src/bin/pg_arc=
hivecleanup/pg_archivecleanup.c
index 12338e3bb2..6c3e7f4e01 100644
--- a/src/bin/pg_archivecleanup/pg_archivecleanup.c
+++ b/src/bin/pg_archivecleanup/pg_archivecleanup.c
@@ -151,21 +151,30 @@ CleanupPriorWALFiles(void)
 				{
 					pg_log_error("could not remove file \"%s\": %m",
 								 WALFilePath);
-					break;
+					exit(1);
 				}
 			}
 		}
=20
 		if (errno)
+		{
 			pg_log_error("could not read archive location \"%s\": %m",
 						 archiveLocation);
+			exit(1);
+		}
 		if (closedir(xldir))
+		{
 			pg_log_error("could not close archive location \"%s\": %m",
 						 archiveLocation);
+			exit(1);
+		}
 	}
 	else
+	{
 		pg_log_error("could not open archive location \"%s\": %m",
 					 archiveLocation);
+		exit(1);
+	}
 }
=20
 /*
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/=
pg_basebackup.c
index 8f69c57380..7296eb97d0 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -1626,8 +1626,11 @@ ReceiveTarAndUnpackCopyChunk(size_t r, char *copybuf=
, void *callback_data)
 				}
 #ifndef WIN32
 				if (chmod(state->filename, (mode_t) filemode))
+				{
 					pg_log_error("could not set permissions on directory \"%s\": %m",
 								 state->filename);
+					exit(1);
+				}
 #endif
 			}
 			else if (copybuf[156] =3D=3D '2')
@@ -1676,8 +1679,11 @@ ReceiveTarAndUnpackCopyChunk(size_t r, char *copybuf=
, void *callback_data)
=20
 #ifndef WIN32
 		if (chmod(state->filename, (mode_t) filemode))
+		{
 			pg_log_error("could not set permissions on file \"%s\": %m",
 						 state->filename);
+			exit(1);
+		}
 #endif
=20
 		if (state->current_len_left =3D=3D 0)
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup=
/pg_recvlogical.c
index 1d59bf3744..ebeb12d497 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -341,7 +341,10 @@ StreamLogicalLog(void)
 			}
=20
 			if (fstat(outfd, &statbuf) !=3D 0)
+			{
 				pg_log_error("could not stat file \"%s\": %m", outfile);
+				goto error;
+			}
=20
 			output_isfile =3D S_ISREG(statbuf.st_mode) && !isatty(outfd);
 		}
diff --git a/src/bin/pg_verifybackup/pg_verifybackup.c b/src/bin/pg_verifyb=
ackup/pg_verifybackup.c
index f5ebd57a47..bb93b43093 100644
--- a/src/bin/pg_verifybackup/pg_verifybackup.c
+++ b/src/bin/pg_verifybackup/pg_verifybackup.c
@@ -304,6 +304,7 @@ main(int argc, char **argv)
 							 "but was not the same version as %s.\n"
 							 "Check your installation.",
 							 "pg_waldump", full_path, "pg_verifybackup");
+			exit(1);
 		}
 	}
=20
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index c51ebb8e31..55d14604c0 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -6469,7 +6469,10 @@ main(int argc, char **argv)
=20
 	errno =3D THREAD_BARRIER_INIT(&barrier, nthreads);
 	if (errno !=3D 0)
+	{
 		pg_log_fatal("could not initialize barrier: %m");
+		exit(1);
+	}
=20
 #ifdef ENABLE_THREAD_SAFETY
 	/* start all threads but thread 0 which is executed directly later */

--78Rq8kcczyyetN1b--

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

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

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmEAzHQACgkQnvQgOdby
QH1RIg/+LgiAYuyCDAA6QfV9sx+F/ZbX3n7BMYyQ5R19OItJKC3uAFtVvhpNe98g
hN7Id/4hvpm93vPoHGO4BlVLgTUnGk/Iw5X/a6crVMRKHkpTH05yhHuwu1kRuTx/
lR2FwLifHZstsX2sZDl/n2cLQD0cnei1L3yKBFLKIVH6nkbxSoHJkkrhqO6OilQB
lDRRoiYa4Ku+goF+YSLraohNFwrF3j8wALnjQCG/xvc0ruVmSgsNbf1ZRIdF/O7k
fhgsmcxyh8eWdVyUioPAvFKpmQ9OmAxdtiECwpgLsl26C3cd9DG15o2QLR+pY2oq
89dtVn0rD0DRDajubf3573ujAYHAxTXsUwdd9NQz/S5IcZ+JWqj3FjjztDPiJxc2
8lJ7YgqlkSphtP0IIem0r3N/2lPReumpnGzAvnasBBAeYPq1kWJqyhoUtqXN0P4u
cVrbzmgcXQbw+JDjMTPJVeA6dNjnUcBJroAkqW01ohgKBYxkBnKguG6dU4rwWMRc
AP6Zsq7mjvVViL/iOuj+nXyHpcgzm6nWOPPZt/KAzs1sJMXNmlsFgO+2gHfoSJ68
m8CLLCYKx4SY+osXBcrvTZ36PRdLPKbxYGULYdA5xN/BmKHtFjQN7g5wXQCP/o2b
4i6RUStHMKipOA1IURyVtvs2VGZmrazWTxSpQwLAgGNa/FROsMw=
=beFp
-----END PGP SIGNATURE-----

--rod2M7KjGuY22RMv--