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.GE9812@tamriel.snowman.net

diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index e0c2bd3cb5277e9b2b34853124bb4ecf8c30c174..b049264caf1595104351703d8e069b642621371b 100644 (file)
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -144,6 +144,7 @@ typedef struct _restoreOptions
        int                     number_of_jobs;
 
        bool       *idWanted;           /* array showing which dump IDs to emit */
+       int                     binary_upgrade;
 } RestoreOptions;
 
 /*

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 41cb89692a2bdfb380830849eaf0c49544aefac6..753f92e68f8980d1fde9b47161e48ab113811609 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -2576,7 +2576,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 2010d804b9402ca8a416043f3f448a0f39177a88..08841232d9805c7b82101379dd81060eab7d8975 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -730,7 +730,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);
 
        /*
@@ -799,6 +807,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;
@@ -2423,8 +2432,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);
@@ -2449,6 +2464,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");
 
@@ -7001,7 +7023,8 @@ dumpComment(Archive *fout, const char *target,
        }
        else
        {
-               if (schemaOnly)
+               /* We do dump blob comments in binary-upgrade mode */
+               if (schemaOnly && !binary_upgrade)
                        return;
        }
 
@@ -11985,7 +12008,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 266a905066ab6b56adb517b1fb141d3337e88350..5af54576fe2766cb58b265d4854d42fae36a5c93 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)
@@ -1125,11 +1125,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}
@@ -1469,7 +1469,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 1b5560f9704327eb4119484287e7c0cc1e1acfce..2292fd353386cbc6115ce6ea4fbb45800f8c580f 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
+test: privileges security_label collate large_object
 
 test: misc
 # rules cannot run concurrently with any test that creates a view

diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 355fe74a0bc00a705ead9ac81e7263e48c7e3eb8..da3b46b8f8604b01962a62c4269be1ef3b2b9833 100644 (file)
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -94,6 +94,7 @@ test: prepared_xacts
 test: privileges
 test: security_label
 test: collate
+test: large_object
 test: misc
 test: rules
 test: select_views

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 16786ffbdce6f250cbf3369ffad8ea49f4642865..c856e497661f697761cb2dc81e15ea45584a72df 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;
 
@@ -694,7 +694,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;
 
@@ -897,7 +897,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;