[Issue #169] check for interrupt more frequently during restore

This commit is contained in:
Grigory Smolkin
2020-01-28 20:42:47 +03:00
parent ee36dd9d29
commit 9c3d299854
+8 -4
View File
@@ -983,10 +983,6 @@ restore_data_file_new(parray *parent_chain, pgFile *dest_file, FILE *out, const
pgBackup *backup = (pgBackup *) parray_get(parent_chain, i);
/* check for interrupt */
if (interrupted || thread_interrupted)
elog(ERROR, "Interrupted during restore");
/* lookup file in intermediate backup */
res_file = parray_bsearch(backup->files, dest_file, pgFileCompareRelPathWithExternal);
tmp_file = (res_file) ? *res_file : NULL;
@@ -1050,6 +1046,10 @@ restore_data_file_internal(FILE *in, FILE *out, pgFile *file, uint32 backup_vers
DataPage page;
int32 uncompressed_size = 0;
/* check for interrupt */
if (interrupted || thread_interrupted)
elog(ERROR, "Interrupted during data file restore");
/* read BackupPageHeader */
read_len = fread(&header, 1, sizeof(header), in);
@@ -1207,6 +1207,10 @@ restore_non_data_file_internal(FILE *in, FILE *out, pgFile *file,
{
read_len = 0;
/* check for interrupt */
if (interrupted || thread_interrupted)
elog(ERROR, "Interrupted during non-data file restore");
if ((read_len = fio_fread(in, buf, sizeof(buf))) != sizeof(buf))
break;