From 7428e0cc951b40dc556b61dbb338c0c38effecbe Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Fri, 24 Apr 2020 11:26:51 -0400 Subject: [PATCH 1/2] Fix bogus tar-file padding logic for standby.signal. When pg_basebackup -R is used, we inject standby.signal into the tar file for the main tablespace. The proper thing to do is to pad each file injected into the tar file out to a 512-byte boundary by appending nulls, but here the file is of length 0 and we add 511 zero bytes. Since 0 is already a multiple of 512, we should not add any zero bytes. Do that instead. --- src/bin/pg_basebackup/pg_basebackup.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index faa69d14ce..c1d3d8624b 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -1207,7 +1207,12 @@ ReceiveTarFile(PGconn *conn, PGresult *res, int rownum) time(NULL)); writeTarData(&state, header, sizeof(header)); - writeTarData(&state, zerobuf, 511); + + /* + * we don't need to pad out to a multiple of the tar block size + * here, because the file is zero length, which is a multiple of + * any block size. + */ } } -- 2.24.2 (Apple Git-127)