pg_upgrade: Fix large object COMMENTS, SECURITY LABELS

When performing a pg_upgrade, we copy the files behind pg_largeobject
and pg_largeobject_metadata, allowing us to avoid having to dump out and
reload the actual data for large objects and their ACLs.

Unfortunately, that isn't all of the information which can be associated
with large objects.  Currently, we also support COMMENTs and SECURITY
LABELs with large objects and these were being silently dropped during a
pg_upgrade as pg_dump would skip everything having to do with a large
object and pg_upgrade only copied the tables mentioned to the new
cluster.

As the file copies happen after the catalog dump and reload, we can't
simply include the COMMENTs and SECURITY LABELs in pg_dump's binary-mode
output but we also have to include the actual large object definition as
well.  With the definition, comments, and security labels in the pg_dump
output and the file copies performed by pg_upgrade, all of the data and
metadata associated with large objects is able to be successfully pulled
forward across a pg_upgrade.

In 9.6 and master, we can simply adjust the dump bitmask to indicate
which components we don't want.  In 9.5 and earlier, we have to put
explciit checks in in dumpBlob() and dumpBlobs() to not include the ACL
or the data when in binary-upgrade mode.

Adjustments made to the privileges regression test to allow another test
(large_object.sql) to be added which explicitly leaves a large object
with a comment in place to provide coverage of that case with
pg_upgrade.

Back-patch to all supported branches.

Discussion: https://postgr.es/m/20170221162655[email protected]

diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index a89a8bde5da70ff7fc359793c65d6abbc6a59b6a..5c974b762f333590f28cb548722d1b93456bcde3 100644 (file)
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -149,6 +149,7 @@ typedef struct _restoreOptions
    bool        single_txn;
 
    bool       *idWanted;       /* array showing which dump IDs to emit */
+   int         binary_upgrade;
 } RestoreOptions;
 
 typedef void (*SetupWorkerPtr) (Archive *AH, RestoreOptions *ropt);

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index f156325d03e74899d16892fef9aa21fc50e27a67..0bae989c4c1c433bd2be60f9b2f98c4f95b22615 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2557,7 +2557,17 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 
    /* Mask it if we only want schema */
    if (ropt->schemaOnly)
-       res = res & REQ_SCHEMA;
+   {
+       /*
+        * In binary-upgrade mode, even with schema-only set, we do not mask
+        * out large objects.  Only large object definitions, comments and
+        * other information should be generated in binary-upgrade mode (not
+        * the actual data).
+        */
+       if (!(ropt->binary_upgrade && strcmp(te->desc,"BLOB") == 0) &&
+       !(ropt->binary_upgrade && strncmp(te->tag,"LARGE OBJECT ", 13) == 0))
+           res = res & REQ_SCHEMA;
+   }
 
    /* Mask it if we only want data */
    if (ropt->dataOnly)

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index bc55ba797801a09b138012fb1bffc7c1a335a8f4..a9ea3700090832c3075a7e212848f53f37271f8f 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -771,7 +771,15 @@ main(int argc, char **argv)
            getTableDataFKConstraints();
    }
 
-   if (outputBlobs)
+   /*
+    * In binary-upgrade mode, we do not have to worry about the actual blob
+    * data or the associated metadata that resides in the pg_largeobject and
+    * pg_largeobject_metadata tables, respectivly.
+    *
+    * However, we do need to collect blob information as there may be
+    * comments or other information on blobs that we do need to dump out.
+    */
+   if (outputBlobs || binary_upgrade)
        getBlobs(fout);
 
    /*
@@ -844,6 +852,7 @@ main(int argc, char **argv)
    ropt->noTablespace = outputNoTablespaces;
    ropt->disable_triggers = disable_triggers;
    ropt->use_setsessauth = use_setsessauth;
+   ropt->binary_upgrade = binary_upgrade;
 
    if (compressLevel == -1)
        ropt->compression = 0;
@@ -2771,8 +2780,14 @@ dumpBlob(Archive *fout, BlobInfo *binfo)
                 NULL, binfo->rolname,
                 binfo->dobj.catId, 0, binfo->dobj.dumpId);
 
-   /* Dump ACL if any */
-   if (binfo->blobacl)
+   /*
+    * Dump ACL if any
+    *
+    * Do not dump the ACL in binary-upgrade mode, however, as the ACL will be
+    * copied over by pg_upgrade as it is part of the pg_largeobject_metadata
+    * table.
+    */
+   if (binfo->blobacl && !binary_upgrade)
        dumpACL(fout, binfo->dobj.catId, binfo->dobj.dumpId, "LARGE OBJECT",
                binfo->dobj.name, NULL, cquery->data,
                NULL, binfo->rolname, binfo->blobacl);
@@ -2797,6 +2812,13 @@ dumpBlobs(Archive *fout, void *arg)
    int         i;
    int         cnt;
 
+   /*
+    * Do not dump out blob data in binary-upgrade mode, pg_upgrade will copy
+    * the pg_largeobject table over entirely from the old cluster.
+    */
+   if (binary_upgrade)
+       return 1;
+
    if (g_verbose)
        write_msg(NULL, "saving large objects\n");
 
@@ -7514,7 +7536,8 @@ dumpComment(Archive *fout, const char *target,
    }
    else
    {
-       if (schemaOnly)
+       /* We do dump blob comments in binary-upgrade mode */
+       if (schemaOnly && !binary_upgrade)
            return;
    }
 
@@ -12504,7 +12527,8 @@ dumpSecLabel(Archive *fout, const char *target,
    }
    else
    {
-       if (schemaOnly)
+       /* We do dump blob security labels in binary-upgrade mode */
+       if (schemaOnly && !binary_upgrade)
            return;
    }
 

diff --git a/src/test/regress/expected/large_object.out b/src/test/regress/expected/large_object.out
new file mode 100644 (file)
index 0000000..b00d47c
--- /dev/null
+++ b/src/test/regress/expected/large_object.out
@@ -0,0 +1,15 @@
+-- This is more-or-less DROP IF EXISTS LARGE OBJECT 3001;
+WITH unlink AS (SELECT lo_unlink(loid) FROM pg_largeobject WHERE loid = 3001) SELECT 1;
+ ?column? 
+----------
+        1
+(1 row)
+
+-- Test creation of a large object and leave it for testing pg_upgrade
+SELECT lo_create(3001);
+ lo_create 
+-----------
+      3001
+(1 row)
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';

diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index f4aae91eedc4a63be77e2265dbbc41dd389ff1ab..16b1ea7f250472a71e9d6bf19ecbd78b648a620f 100644 (file)
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -12,7 +12,7 @@ DROP ROLE IF EXISTS regressuser3;
 DROP ROLE IF EXISTS regressuser4;
 DROP ROLE IF EXISTS regressuser5;
 DROP ROLE IF EXISTS regressuser6;
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
  lo_unlink 
 -----------
 (0 rows)
@@ -1143,11 +1143,11 @@ SELECT lo_unlink(2002);
 
 \c -
 -- confirm ACL setting
-SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata;
+SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
  oid  |  ownername   |                                          lomacl                                          
 ------+--------------+------------------------------------------------------------------------------------------
- 1002 | regressuser1 | 
  1001 | regressuser1 | {regressuser1=rw/regressuser1,=rw/regressuser1}
+ 1002 | regressuser1 | 
  1003 | regressuser1 | {regressuser1=rw/regressuser1,regressuser2=r/regressuser1}
  1004 | regressuser1 | {regressuser1=rw/regressuser1,regressuser2=rw/regressuser1}
  1005 | regressuser1 | {regressuser1=rw/regressuser1,regressuser2=r*w/regressuser1,regressuser3=r/regressuser2}
@@ -1488,7 +1488,7 @@ DROP TABLE atest6;
 DROP TABLE atestc;
 DROP TABLE atestp1;
 DROP TABLE atestp2;
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
  lo_unlink 
 -----------
          1

diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index 4c6ce9702c57e44e50be8d7371c59cb9554cdb32..b8984088bb16bdd5ffe27e12860955fa162270bb 100644 (file)
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -83,7 +83,7 @@ test: select_into select_distinct select_distinct_on select_implicit select_havi
 # ----------
 # Another group of parallel tests
 # ----------
-test: privileges security_label collate matview
+test: privileges security_label collate matview large_object
 
 # ----------
 # Another group of parallel tests

diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 57fc93d3cda84ad0a36c15601465d686c22c0ee2..dee345a5dfb4162bc15c4bd406d6d5bae429d77e 100644 (file)
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -96,6 +96,7 @@ test: privileges
 test: security_label
 test: collate
 test: matview
+test: large_object
 test: alter_generic
 test: misc
 test: psql

diff --git a/src/test/regress/sql/large_object.sql b/src/test/regress/sql/large_object.sql
new file mode 100644 (file)
index 0000000..c06b393
--- /dev/null
+++ b/src/test/regress/sql/large_object.sql
@@ -0,0 +1,7 @@
+-- This is more-or-less DROP IF EXISTS LARGE OBJECT 3001;
+WITH unlink AS (SELECT lo_unlink(loid) FROM pg_largeobject WHERE loid = 3001) SELECT 1;
+
+-- Test creation of a large object and leave it for testing pg_upgrade
+SELECT lo_create(3001);
+
+COMMENT ON LARGE OBJECT 3001 IS 'testing comments';

diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index 1dc44d46a84f06b08e81f02b4e2dd29155f8ea31..e71ade178dec5b8f43b8427b448cfb4c7f438ff6 100644 (file)
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -17,7 +17,7 @@ DROP ROLE IF EXISTS regressuser4;
 DROP ROLE IF EXISTS regressuser5;
 DROP ROLE IF EXISTS regressuser6;
 
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
 
 RESET client_min_messages;
 
@@ -712,7 +712,7 @@ SELECT lo_unlink(2002);
 
 \c -
 -- confirm ACL setting
-SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata;
+SELECT oid, pg_get_userbyid(lomowner) ownername, lomacl FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
 
 SET SESSION AUTHORIZATION regressuser3;
 
@@ -916,7 +916,7 @@ DROP TABLE atestc;
 DROP TABLE atestp1;
 DROP TABLE atestp2;
 
-SELECT lo_unlink(oid) FROM pg_largeobject_metadata;
+SELECT lo_unlink(oid) FROM pg_largeobject_metadata WHERE oid >= 1000 AND oid < 3000 ORDER BY oid;
 
 DROP GROUP regressgroup1;
 DROP GROUP regressgroup2;