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.

diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index a8bcd590ec19984d735cb1c080496191da90d967..21438d151d07807f73bbecea48c31e5da4d26658 100644 (file)
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -411,7 +411,12 @@ _PrintFileData(ArchiveHandle *AH, char *filename, RestoreOptions *ropt)
        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)
@@ -556,6 +561,9 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
        lclContext *ctx = (lclContext *) AH->formatData;
        size_t          res;
 
+       /* Are we aborting? */
+       checkAborting(AH);
+
        res = cfread(buf, len, ctx->dataFH);
 
        return res;