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

When doing a parallel restore, we must guard against out-of-range dependency

Browse Source 
dump IDs, because the array we're using is sized according to the highest
dump ID actually defined in the archive file.  In a partial dump there could
be references to higher dump IDs that weren't dumped.  Treat these the same
as references to in-range IDs that weren't dumped.  (The whole thing is a
bit scary because the missing objects might have been part of dependency
chains, which we won't know about.  Not much we can do though --- throwing
an error is probably overreaction.)

Also, reject parallel restore with pre-1.8 archive version (made by pre-8.0
pg_dump).  In these old versions the dependency entries are OIDs, not dump
IDs, and we don't have enough information to interpret them.

Per bug #5288 from Jon Erdman.
This commit is contained in:
Tom Lane 2010-01-19 18:39:26 +00:00
parent dcd647d7cf
commit 3fc333d88a
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.172 2009/06/11 14:49:07 momjian Exp $
* $PostgreSQL: pgsql/src/bin/pg_dump/pg_backup_archiver.c,v 1.172.2.1 2010/01/19 18:39:26 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -128,7 +128,8 @@ static bool has_lock_conflicts(TocEntry *te1, TocEntry *te2);
static void repoint_table_dependencies(ArchiveHandle *AH,
DumpId tableId, DumpId tableDataId);
static void identify_locking_dependencies(TocEntry *te,
TocEntry **tocsByDumpId);
TocEntry **tocsByDumpId,
DumpId maxDumpId);
static void reduce_dependencies(ArchiveHandle *AH, TocEntry *te);
static void mark_create_done(ArchiveHandle *AH, TocEntry *te);
static void inhibit_data_for_failed_table(ArchiveHandle *AH, TocEntry *te);
@ -3076,6 +3077,10 @@ restore_toc_entries_parallel(ArchiveHandle *AH)
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");
slots = (ParallelSlot *) calloc(sizeof(ParallelSlot), n_slots);
/* Adjust dependency information */
@ -3599,6 +3604,7 @@ fix_dependencies(ArchiveHandle *AH)
{
TocEntry **tocsByDumpId;
TocEntry *te;
DumpId maxDumpId;
int i;
/*
@ -3606,9 +3612,14 @@ fix_dependencies(ArchiveHandle *AH)
* indexes the TOC entries by dump ID, rather than searching the TOC list
* repeatedly. Entries for dump IDs not present in the TOC will be NULL.
*
* NOTE: because maxDumpId is just the highest dump ID defined in the
* archive, there might be dependencies for IDs > maxDumpId. All uses
* of this array must guard against out-of-range dependency numbers.
*
* Also, initialize the depCount fields.
*/
tocsByDumpId = (TocEntry **) calloc(AH->maxDumpId, sizeof(TocEntry *));
maxDumpId = AH->maxDumpId;
tocsByDumpId = (TocEntry **) calloc(maxDumpId, sizeof(TocEntry *));
for (te = AH->toc->next; te != AH->toc; te = te->next)
{
tocsByDumpId[te->dumpId - 1] = te;
@ -3635,7 +3646,8 @@ fix_dependencies(ArchiveHandle *AH)
{
DumpId tableId = te->dependencies[0];
if (tocsByDumpId[tableId - 1] == NULL ||
if (tableId > maxDumpId ||
tocsByDumpId[tableId - 1] == NULL ||
strcmp(tocsByDumpId[tableId - 1]->desc, "TABLE") == 0)
{
repoint_table_dependencies(AH, tableId, te->dumpId);
@ -3680,7 +3692,9 @@ fix_dependencies(ArchiveHandle *AH)
{
for (i = 0; i < te->nDeps; i++)
{
if (tocsByDumpId[te->dependencies[i] - 1] == NULL)
DumpId depid = te->dependencies[i];
if (depid > maxDumpId || tocsByDumpId[depid - 1] == NULL)
te->depCount--;
}
}
@ -3692,7 +3706,7 @@ fix_dependencies(ArchiveHandle *AH)
{
te->lockDeps = NULL;
te->nLockDeps = 0;
identify_locking_dependencies(te, tocsByDumpId);
identify_locking_dependencies(te, tocsByDumpId, maxDumpId);
}
free(tocsByDumpId);
@ -3729,11 +3743,13 @@ repoint_table_dependencies(ArchiveHandle *AH,
* Identify which objects we'll need exclusive lock on in order to restore
* the given TOC entry (*other* than the one identified by the TOC entry
* itself). Record their dump IDs in the entry's lockDeps[] array.
* tocsByDumpId[] is a convenience array to avoid searching the TOC
* for each dependency.
* tocsByDumpId[] is a convenience array (of size maxDumpId) to avoid
* searching the TOC for each dependency.
*/
static void
identify_locking_dependencies(TocEntry *te, TocEntry **tocsByDumpId)
identify_locking_dependencies(TocEntry *te,
TocEntry **tocsByDumpId,
DumpId maxDumpId)
{
DumpId *lockids;
int nlockids;
@ -3764,7 +3780,7 @@ identify_locking_dependencies(TocEntry *te, TocEntry **tocsByDumpId)
{
DumpId depid = te->dependencies[i];
if (tocsByDumpId[depid - 1] &&
if (depid <= maxDumpId && tocsByDumpId[depid - 1] &&
strcmp(tocsByDumpId[depid - 1]->desc, "TABLE DATA") == 0)
lockids[nlockids++] = depid;
}