aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backend/catalog/heap.c6
-rw-r--r--src/backend/catalog/index.c3
-rw-r--r--src/backend/catalog/pg_enum.c3
-rw-r--r--src/backend/catalog/pg_type.c4
-rw-r--r--src/backend/catalog/toasting.c5
-rw-r--r--src/backend/commands/typecmds.c2
-rw-r--r--src/backend/commands/user.c2
-rw-r--r--src/backend/postmaster/postmaster.c18
-rw-r--r--src/backend/tcop/postgres.c7
-rw-r--r--src/backend/utils/init/globals.c1
-rw-r--r--src/backend/utils/init/postinit.c10
-rw-r--r--src/include/catalog/catversion.h2
-rw-r--r--src/include/miscadmin.h1
13 files changed, 48 insertions, 16 deletions
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index 28d5c549a32..4c089677030 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -1053,7 +1053,8 @@ heap_create_with_catalog(const char *relname,
* Use binary-upgrade override for pg_class.oid/relfilenode, if
* supplied.
*/
- if (OidIsValid(binary_upgrade_next_heap_pg_class_oid) &&
+ if (IsBinaryUpgrade &&
+ OidIsValid(binary_upgrade_next_heap_pg_class_oid) &&
(relkind == RELKIND_RELATION || relkind == RELKIND_SEQUENCE ||
relkind == RELKIND_VIEW || relkind == RELKIND_COMPOSITE_TYPE ||
relkind == RELKIND_FOREIGN_TABLE))
@@ -1061,7 +1062,8 @@ heap_create_with_catalog(const char *relname,
relid = binary_upgrade_next_heap_pg_class_oid;
binary_upgrade_next_heap_pg_class_oid = InvalidOid;
}
- else if (OidIsValid(binary_upgrade_next_toast_pg_class_oid) &&
+ else if (IsBinaryUpgrade &&
+ OidIsValid(binary_upgrade_next_toast_pg_class_oid) &&
relkind == RELKIND_TOASTVALUE)
{
relid = binary_upgrade_next_toast_pg_class_oid;
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index bc630a6f3ac..a0898e00488 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -789,7 +789,8 @@ index_create(Relation heapRelation,
* Use binary-upgrade override for pg_class.oid/relfilenode, if
* supplied.
*/
- if (OidIsValid(binary_upgrade_next_index_pg_class_oid))
+ if (IsBinaryUpgrade &&
+ OidIsValid(binary_upgrade_next_index_pg_class_oid))
{
indexRelationId = binary_upgrade_next_index_pg_class_oid;
binary_upgrade_next_index_pg_class_oid = InvalidOid;
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index 08d8aa13f33..61a9322d901 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -21,6 +21,7 @@
#include "catalog/pg_enum.h"
#include "catalog/pg_type.h"
#include "storage/lmgr.h"
+#include "miscadmin.h"
#include "utils/builtins.h"
#include "utils/fmgroids.h"
#include "utils/rel.h"
@@ -311,7 +312,7 @@ restart:
}
/* Get a new OID for the new label */
- if (OidIsValid(binary_upgrade_next_pg_enum_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_pg_enum_oid))
{
/*
* Use binary-upgrade override for pg_enum.oid, if supplied. During
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index b6912578786..de5c63defe5 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -125,7 +125,7 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId)
tup = heap_form_tuple(tupDesc, values, nulls);
/* Use binary-upgrade override for pg_type.oid, if supplied. */
- if (OidIsValid(binary_upgrade_next_pg_type_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_pg_type_oid))
{
HeapTupleSetOid(tup, binary_upgrade_next_pg_type_oid);
binary_upgrade_next_pg_type_oid = InvalidOid;
@@ -430,7 +430,7 @@ TypeCreate(Oid newTypeOid,
if (OidIsValid(newTypeOid))
HeapTupleSetOid(tup, newTypeOid);
/* Use binary-upgrade override for pg_type.oid, if supplied. */
- else if (OidIsValid(binary_upgrade_next_pg_type_oid))
+ else if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_pg_type_oid))
{
HeapTupleSetOid(tup, binary_upgrade_next_pg_type_oid);
binary_upgrade_next_pg_type_oid = InvalidOid;
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index 85fe57fb2a5..362d26d9d1f 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -157,7 +157,8 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Datum reloptio
* creation even if it seems not to need one.
*/
if (!needs_toast_table(rel) &&
- !OidIsValid(binary_upgrade_next_toast_pg_class_oid))
+ (!IsBinaryUpgrade ||
+ !OidIsValid(binary_upgrade_next_toast_pg_class_oid)))
return false;
/*
@@ -202,7 +203,7 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid, Datum reloptio
namespaceid = PG_TOAST_NAMESPACE;
/* Use binary-upgrade override for pg_type.oid, if supplied. */
- if (OidIsValid(binary_upgrade_next_toast_pg_type_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_toast_pg_type_oid))
{
toast_typid = binary_upgrade_next_toast_pg_type_oid;
binary_upgrade_next_toast_pg_type_oid = InvalidOid;
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 7388e5a3db9..f8eb5bc4a65 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -1550,7 +1550,7 @@ AssignTypeArrayOid(void)
Oid type_array_oid;
/* Use binary-upgrade override for pg_type.typarray, if supplied. */
- if (OidIsValid(binary_upgrade_next_array_pg_type_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_array_pg_type_oid))
{
type_array_oid = binary_upgrade_next_array_pg_type_oid;
binary_upgrade_next_array_pg_type_oid = InvalidOid;
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 3f7d4992af8..838d6eba205 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -388,7 +388,7 @@ CreateRole(CreateRoleStmt *stmt)
* pg_largeobject_metadata contains pg_authid.oid's, so we use the
* binary-upgrade override, if specified.
*/
- if (OidIsValid(binary_upgrade_next_pg_authid_oid))
+ if (IsBinaryUpgrade && OidIsValid(binary_upgrade_next_pg_authid_oid))
{
HeapTupleSetOid(tuple, binary_upgrade_next_pg_authid_oid);
binary_upgrade_next_pg_authid_oid = InvalidOid;
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 6e7f66472fd..c0cf0336a1e 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -529,7 +529,7 @@ PostmasterMain(int argc, char *argv[])
* tcop/postgres.c (the option sets should not conflict) and with the
* common help() function in main/main.c.
*/
- while ((opt = getopt(argc, argv, "A:B:c:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:W:-:")) != -1)
+ while ((opt = getopt(argc, argv, "A:B:bc:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:W:-:")) != -1)
{
switch (opt)
{
@@ -541,6 +541,11 @@ PostmasterMain(int argc, char *argv[])
SetConfigOption("shared_buffers", optarg, PGC_POSTMASTER, PGC_S_ARGV);
break;
+ case 'b':
+ /* Undocumented flag used for binary upgrades */
+ IsBinaryUpgrade = true;
+ break;
+
case 'D':
userDoption = optarg;
break;
@@ -1480,8 +1485,13 @@ ServerLoop(void)
if (WalWriterPID == 0 && pmState == PM_RUN)
WalWriterPID = StartWalWriter();
- /* If we have lost the autovacuum launcher, try to start a new one */
- if (AutoVacPID == 0 &&
+ /*
+ * If we have lost the autovacuum launcher, try to start a new one.
+ * We don't want autovacuum to run in binary upgrade mode because
+ * autovacuum might update relfrozenxid for empty tables before
+ * the physical files are put in place.
+ */
+ if (!IsBinaryUpgrade && AutoVacPID == 0 &&
(AutoVacuumingActive() || start_autovac_launcher) &&
pmState == PM_RUN)
{
@@ -2413,7 +2423,7 @@ reaper(SIGNAL_ARGS)
*/
if (WalWriterPID == 0)
WalWriterPID = StartWalWriter();
- if (AutoVacuumingActive() && AutoVacPID == 0)
+ if (!IsBinaryUpgrade && AutoVacuumingActive() && AutoVacPID == 0)
AutoVacPID = StartAutoVacLauncher();
if (XLogArchivingActive() && PgArchPID == 0)
PgArchPID = pgarch_start();
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 59b7666c109..a07661f02ab 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -3238,7 +3238,7 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx)
* postmaster/postmaster.c (the option sets should not conflict) and with
* the common help() function in main/main.c.
*/
- while ((flag = getopt(argc, argv, "A:B:c:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:v:W:-:")) != -1)
+ while ((flag = getopt(argc, argv, "A:B:bc:D:d:EeFf:h:ijk:lN:nOo:Pp:r:S:sTt:v:W:-:")) != -1)
{
switch (flag)
{
@@ -3250,6 +3250,11 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx)
SetConfigOption("shared_buffers", optarg, ctx, gucsource);
break;
+ case 'b':
+ /* Undocumented flag used for binary upgrades */
+ IsBinaryUpgrade = true;
+ break;
+
case 'D':
if (secure)
userDoption = strdup(optarg);
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 984ffd0c73e..c4c41544a21 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -85,6 +85,7 @@ pid_t PostmasterPid = 0;
*/
bool IsPostmasterEnvironment = false;
bool IsUnderPostmaster = false;
+bool IsBinaryUpgrade = false;
bool ExitOnAnyError = false;
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index a4c5d4c69ab..1f6fba5f752 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -626,6 +626,16 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
}
/*
+ * Binary upgrades only allowed super-user connections
+ */
+ if (IsBinaryUpgrade && !am_superuser)
+ {
+ ereport(FATAL,
+ (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+ errmsg("must be superuser to connect in binary upgrade mode")));
+ }
+
+ /*
* The last few connections slots are reserved for superusers. Although
* replication connections currently require superuser privileges, we
* don't allow them to consume the reserved slots, which are intended for
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 53c684aa4e3..2df489f32ea 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
*/
/* yyyymmddN */
-#define CATALOG_VERSION_NO 201104181
+#define CATALOG_VERSION_NO 201104251
#endif
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index aa8cce5ca81..9d194171a56 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -124,6 +124,7 @@ do { \
extern pid_t PostmasterPid;
extern bool IsPostmasterEnvironment;
extern PGDLLIMPORT bool IsUnderPostmaster;
+extern bool IsBinaryUpgrade;
extern bool ExitOnAnyError;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 13:03:26 +0000