diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-05-29 13:18:48 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-05-29 13:18:48 -0400 |
| commit | 3c8aa6654a44837a2c60fc6061665df1adfd677c (patch) | |
| tree | 4a6abe2d027e27fc908daf6cc9e93d20d0b60a9e | |
| parent | 210981a4a9fdd19cb299f248a7ecc25db9bf7d9d (diff) | |
| download | postgresql-3c8aa6654a44837a2c60fc6061665df1adfd677c.tar.gz postgresql-3c8aa6654a44837a2c60fc6061665df1adfd677c.zip | |
Fix missing abort checks in pg_backup_directory.c.
Parallel restore from directory format failed to respond to control-C
in a timely manner, because there were no checkAborting() calls in the
code path that reads data from a file and sends it to the backend.
If any worker was in the midst of restoring data for a large table,
you'd just have to wait.
This fix doesn't do anything for the problem of aborting a long-running
server-side command, but at least it fixes things for data transfers.
Back-patch to 9.3 where parallel restore was introduced.
| -rw-r--r-- | src/bin/pg_dump/pg_backup_directory.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c index 1d7b0cc66ad..27c61905461 100644 --- a/src/bin/pg_dump/pg_backup_directory.c +++ b/src/bin/pg_dump/pg_backup_directory.c @@ -406,7 +406,12 @@ _PrintFileData(ArchiveHandle *AH, char *filename) buflen = ZLIB_OUT_SIZE; while ((cnt = cfread(buf, buflen, cfp))) + { + /* Are we aborting? */ + checkAborting(AH); + ahwrite(buf, 1, cnt, AH); + } free(buf); if (cfclose(cfp) !=0) @@ -543,6 +548,9 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len) { lclContext *ctx = (lclContext *) AH->formatData; + /* Are we aborting? */ + checkAborting(AH); + /* * If there was an I/O error, we already exited in cfread(), so here we * exit on short reads. |