mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Actually, all of parallel restore's limitations should be tested earlier.

Browse Source 
On closer inspection, whining in restore_toc_entries_parallel is really
much too late for any user-facing error case.  The right place to do it
is at the start of RestoreArchive(), before we've done anything interesting
(suh as trying to DROP all the targets ...)

Back-patch to 8.4, where parallel restore was introduced.
This commit is contained in:
Tom Lane 2011-08-28 22:27:48 -04:00
parent 2719a7478d
commit ce530adf8e
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/bin/pg_dump/pg_backup_archiver.c
View File

@ -194,6 +194,7 @@ void
RestoreArchive(Archive *AHX, RestoreOptions *ropt) RestoreArchive(Archive *AHX, RestoreOptions *ropt)
{ {
ArchiveHandle *AH = (ArchiveHandle *) AHX; ArchiveHandle *AH = (ArchiveHandle *) AHX;
bool parallel_mode;
TocEntry *te; TocEntry *te;
teReqs reqs; teReqs reqs;
OutputContext sav; OutputContext sav;
@ -219,6 +220,27 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
if (ropt->create && ropt->single_txn) if (ropt->create && ropt->single_txn)
die_horribly(AH, modulename, "-C and -1 are incompatible options\n"); die_horribly(AH, modulename, "-C and -1 are incompatible options\n");
/*
* If we're going to do parallel restore, there are some restrictions.
*/
parallel_mode = (ropt->number_of_jobs > 1 && ropt->useDB);
if (parallel_mode)
{
/* We haven't got round to making this work for all archive formats */
if (AH->ClonePtr == NULL || AH->ReopenPtr == NULL)
die_horribly(AH, modulename, "parallel restore is not supported with this archive file format\n");
/* Doesn't work if the archive represents dependencies as OIDs */
if (AH->version < K_VERS_1_8)
die_horribly(AH, modulename, "parallel restore is not supported with archives made by pre-8.0 pg_dump\n");
/*
* It's also not gonna work if we can't reopen the input file, so
* let's try that immediately.
*/
(AH->ReopenPtr) (AH);
}
/* /*
* Make sure we won't need (de)compression we haven't got * Make sure we won't need (de)compression we haven't got
*/ */
@ -357,7 +379,7 @@ RestoreArchive(Archive *AHX, RestoreOptions *ropt)
* *
* In parallel mode, turn control over to the parallel-restore logic. * In parallel mode, turn control over to the parallel-restore logic.
*/ */
if (ropt->number_of_jobs > 1 && ropt->useDB) if (parallel_mode)
restore_toc_entries_parallel(AH); restore_toc_entries_parallel(AH);
else else
{ {
@ -3117,20 +3139,6 @@ restore_toc_entries_parallel(ArchiveHandle *AH)
ahlog(AH, 2, "entering restore_toc_entries_parallel\n"); ahlog(AH, 2, "entering restore_toc_entries_parallel\n");
/* we haven't got round to making this work for all archive formats */
if (AH->ClonePtr == NULL || AH->ReopenPtr == NULL)
die_horribly(AH, modulename, "parallel restore is not supported with this archive file format\n");
/* doesn't work if the archive represents dependencies as OIDs, either */
if (AH->version < K_VERS_1_8)
die_horribly(AH, modulename, "parallel restore is not supported with archives made by pre-8.0 pg_dump\n");
/*
* It's also not gonna work if we can't reopen the input file, so let's
* try that immediately.
*/
(AH->ReopenPtr) (AH);
slots = (ParallelSlot *) calloc(sizeof(ParallelSlot), n_slots); slots = (ParallelSlot *) calloc(sizeof(ParallelSlot), n_slots);
/* Adjust dependency information */ /* Adjust dependency information */