Fix identify_locking_dependencies for schema-only dumps.

Without this fix, parallel restore of a schema-only dump can deadlock,
because when the dump is schema-only, the dependency will still be
pointing at the TABLE item rather than the TABLE DATA item.

Robert Haas and Tom Lane

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 3b101d44835a8f62491446265d515d834d2bb876..32a08b038b071d995551d81765b9e62923b3e65b 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -4152,11 +4152,14 @@ identify_locking_dependencies(ArchiveHandle *AH, TocEntry *te)
        return;
 
    /*
-    * We assume the item requires exclusive lock on each TABLE DATA item
-    * listed among its dependencies.  (This was originally a dependency on
-    * the TABLE, but fix_dependencies repointed it to the data item. Note
-    * that all the entry types we are interested in here are POST_DATA, so
-    * they will all have been changed this way.)
+    * We assume the entry requires exclusive lock on each TABLE or TABLE DATA
+    * item listed among its dependencies.  Originally all of these would have
+    * been TABLE items, but repoint_table_dependencies would have repointed
+    * them to the TABLE DATA items if those are present (which they might not
+    * be, eg in a schema-only dump).  Note that all of the entries we are
+    * processing here are POST_DATA; otherwise there might be a significant
+    * difference between a dependency on a table and a dependency on its
+    * data, so that closer analysis would be needed here.
     */
    lockids = (DumpId *) pg_malloc(te->nDeps * sizeof(DumpId));
    nlockids = 0;
@@ -4165,7 +4168,8 @@ identify_locking_dependencies(ArchiveHandle *AH, TocEntry *te)
        DumpId      depid = te->dependencies[i];
 
        if (depid <= AH->maxDumpId && AH->tocsByDumpId[depid] != NULL &&
-           strcmp(AH->tocsByDumpId[depid]->desc, "TABLE DATA") == 0)
+           ((strcmp(AH->tocsByDumpId[depid]->desc, "TABLE DATA") == 0) ||
+             strcmp(AH->tocsByDumpId[depid]->desc, "TABLE") == 0))
            lockids[nlockids++] = depid;
    }