diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-06-19 16:46:07 -0400 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2020-06-19 16:46:07 -0400 |
| commit | 83762d0a928d5ac97b6124d4da70a53f1a98fc33 (patch) | |
| tree | 0a81d3d9badff7698a8b9ef6e4528583a40be090 /src/bin/pg_basebackup/pg_basebackup.c | |
| parent | 9496908d465efc6116eff78dd46fda27603515d1 (diff) | |
Ensure write failure reports no-disk-space
A few places calling fwrite and gzwrite were not setting errno to ENOSPC
when reporting errors, as is customary; this led to some failures being
reported as
"could not write file: Success"
which makes us look silly. Make a few of these places in pg_dump and
pg_basebackup use our customary pattern.
Backpatch-to: 9.5
Author: Justin Pryzby <pryzby@telsasoft.com>
Author: Tom Lane <tgl@sss.pgh.pa.us>
Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://postgr.es/m/20200611153753.GU14879@telsasoft.com
Diffstat (limited to 'src/bin/pg_basebackup/pg_basebackup.c')
| -rw-r--r-- | src/bin/pg_basebackup/pg_basebackup.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c index a783d63df71..37ffa55d121 100644 --- a/src/bin/pg_basebackup/pg_basebackup.c +++ b/src/bin/pg_basebackup/pg_basebackup.c @@ -751,8 +751,12 @@ writeTarData( #ifdef HAVE_LIBZ if (ztarfile != NULL) { + errno = 0; if (gzwrite(ztarfile, buf, r) != r) { + /* if write didn't set errno, assume problem is no disk space */ + if (errno == 0) + errno = ENOSPC; fprintf(stderr, _("%s: could not write to compressed file \"%s\": %s\n"), progname, current_file, get_gz_error(ztarfile)); @@ -762,8 +766,12 @@ writeTarData( else #endif { + errno = 0; if (fwrite(buf, r, 1, tarfile) != 1) { + /* if write didn't set errno, assume problem is no disk space */ + if (errno == 0) + errno = ENOSPC; fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"), progname, current_file, strerror(errno)); disconnect_and_exit(1); @@ -1368,8 +1376,12 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum) continue; } + errno = 0; if (fwrite(copybuf, r, 1, file) != 1) { + /* if write didn't set errno, assume problem is no disk space */ + if (errno == 0) + errno = ENOSPC; fprintf(stderr, _("%s: could not write to file \"%s\": %s\n"), progname, filename, strerror(errno)); disconnect_and_exit(1); |