diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/ipc/procarray.c | 105 | ||||
| -rw-r--r-- | src/backend/storage/ipc/standby.c | 1 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc_tables.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 1 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/server.c | 5 | ||||
| -rw-r--r-- | src/include/storage/standby.h | 1 |
6 files changed, 9 insertions, 113 deletions
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c index fc05e2e293d..80153fb2503 100644 --- a/src/backend/storage/ipc/procarray.c +++ b/src/backend/storage/ipc/procarray.c @@ -367,9 +367,6 @@ static inline void ProcArrayEndTransactionInternal(PGPROC *proc, TransactionId l static void ProcArrayGroupClearXid(PGPROC *proc, TransactionId latestXid); static void MaintainLatestCompletedXid(TransactionId latestXid); static void MaintainLatestCompletedXidRecovery(TransactionId latestXid); -static void TransactionIdRetreatSafely(TransactionId *xid, - int retreat_by, - FullTransactionId rel); static inline FullTransactionId FullXidRelativeTo(FullTransactionId rel, TransactionId xid); @@ -1709,10 +1706,7 @@ TransactionIdIsActive(TransactionId xid) * do about that --- data is only protected if the walsender runs continuously * while queries are executed on the standby. (The Hot Standby code deals * with such cases by failing standby queries that needed to access - * already-removed data, so there's no integrity bug.) The computed values - * are also adjusted with vacuum_defer_cleanup_age, so increasing that setting - * on the fly is another easy way to make horizons move backwards, with no - * consequences for data integrity. + * already-removed data, so there's no integrity bug.) * * Note: the approximate horizons (see definition of GlobalVisState) are * updated by the computations done here. That's currently required for @@ -1877,50 +1871,11 @@ ComputeXidHorizons(ComputeXidHorizonsResult *h) TransactionIdOlder(h->data_oldest_nonremovable, kaxmin); /* temp relations cannot be accessed in recovery */ } - else - { - /* - * Compute the cutoff XID by subtracting vacuum_defer_cleanup_age. - * - * vacuum_defer_cleanup_age provides some additional "slop" for the - * benefit of hot standby queries on standby servers. This is quick - * and dirty, and perhaps not all that useful unless the primary has a - * predictable transaction rate, but it offers some protection when - * there's no walsender connection. Note that we are assuming - * vacuum_defer_cleanup_age isn't large enough to cause wraparound --- - * so guc.c should limit it to no more than the xidStopLimit threshold - * in varsup.c. Also note that we intentionally don't apply - * vacuum_defer_cleanup_age on standby servers. - * - * Need to use TransactionIdRetreatSafely() instead of open-coding the - * subtraction, to prevent creating an xid before - * FirstNormalTransactionId. - */ - Assert(TransactionIdPrecedesOrEquals(h->oldest_considered_running, - h->shared_oldest_nonremovable)); - Assert(TransactionIdPrecedesOrEquals(h->shared_oldest_nonremovable, - h->data_oldest_nonremovable)); - if (vacuum_defer_cleanup_age > 0) - { - TransactionIdRetreatSafely(&h->oldest_considered_running, - vacuum_defer_cleanup_age, - h->latest_completed); - TransactionIdRetreatSafely(&h->shared_oldest_nonremovable, - vacuum_defer_cleanup_age, - h->latest_completed); - TransactionIdRetreatSafely(&h->data_oldest_nonremovable, - vacuum_defer_cleanup_age, - h->latest_completed); - /* defer doesn't apply to temp relations */ - - - Assert(TransactionIdPrecedesOrEquals(h->oldest_considered_running, - h->shared_oldest_nonremovable)); - Assert(TransactionIdPrecedesOrEquals(h->shared_oldest_nonremovable, - h->data_oldest_nonremovable)); - } - } + Assert(TransactionIdPrecedesOrEquals(h->oldest_considered_running, + h->shared_oldest_nonremovable)); + Assert(TransactionIdPrecedesOrEquals(h->shared_oldest_nonremovable, + h->data_oldest_nonremovable)); /* * Check whether there are replication slots requiring an older xmin. @@ -1947,8 +1902,8 @@ ComputeXidHorizons(ComputeXidHorizonsResult *h) h->slot_catalog_xmin); /* - * It's possible that slots / vacuum_defer_cleanup_age backed up the - * horizons further than oldest_considered_running. Fix. + * It's possible that slots backed up the horizons further than + * oldest_considered_running. Fix. */ h->oldest_considered_running = TransactionIdOlder(h->oldest_considered_running, @@ -2490,15 +2445,9 @@ GetSnapshotData(Snapshot snapshot) */ oldestfxid = FullXidRelativeTo(latest_completed, oldestxid); - /* apply vacuum_defer_cleanup_age */ - def_vis_xid_data = xmin; - TransactionIdRetreatSafely(&def_vis_xid_data, - vacuum_defer_cleanup_age, - oldestfxid); - /* Check whether there's a replication slot requiring an older xmin. */ def_vis_xid_data = - TransactionIdOlder(def_vis_xid_data, replication_slot_xmin); + TransactionIdOlder(xmin, replication_slot_xmin); /* * Rows in non-shared, non-catalog tables possibly could be vacuumed @@ -4321,44 +4270,6 @@ GlobalVisCheckRemovableXid(Relation rel, TransactionId xid) } /* - * Safely retract *xid by retreat_by, store the result in *xid. - * - * Need to be careful to prevent *xid from retreating below - * FirstNormalTransactionId during epoch 0. This is important to prevent - * generating xids that cannot be converted to a FullTransactionId without - * wrapping around. - * - * If retreat_by would lead to a too old xid, FirstNormalTransactionId is - * returned instead. - */ -static void -TransactionIdRetreatSafely(TransactionId *xid, int retreat_by, FullTransactionId rel) -{ - TransactionId original_xid = *xid; - FullTransactionId fxid; - uint64 fxid_i; - - Assert(TransactionIdIsNormal(original_xid)); - Assert(retreat_by >= 0); /* relevant GUCs are stored as ints */ - AssertTransactionIdInAllowableRange(original_xid); - - if (retreat_by == 0) - return; - - fxid = FullXidRelativeTo(rel, original_xid); - fxid_i = U64FromFullTransactionId(fxid); - - if ((fxid_i - FirstNormalTransactionId) <= retreat_by) - *xid = FirstNormalTransactionId; - else - { - *xid = TransactionIdRetreatedBy(original_xid, retreat_by); - Assert(TransactionIdIsNormal(*xid)); - Assert(NormalTransactionIdPrecedes(*xid, original_xid)); - } -} - -/* * Convert a 32 bit transaction id into 64 bit transaction id, by assuming it * is within MaxTransactionId / 2 of XidFromFullTransactionId(rel). * diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c index 63a72033f9a..ffe5e1563f5 100644 --- a/src/backend/storage/ipc/standby.c +++ b/src/backend/storage/ipc/standby.c @@ -38,7 +38,6 @@ #include "utils/timestamp.h" /* User-settable GUC parameters */ -int vacuum_defer_cleanup_age; int max_standby_archive_delay = 30 * 1000; int max_standby_streaming_delay = 30 * 1000; bool log_recovery_conflict_waits = false; diff --git a/src/backend/utils/misc/guc_tables.c b/src/backend/utils/misc/guc_tables.c index cab3ddbe11e..2f42cebaf62 100644 --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -2577,15 +2577,6 @@ struct config_int ConfigureNamesInt[] = }, { - {"vacuum_defer_cleanup_age", PGC_SIGHUP, REPLICATION_PRIMARY, - gettext_noop("Number of transactions by which VACUUM and HOT cleanup should be deferred, if any."), - NULL - }, - &vacuum_defer_cleanup_age, - 0, 0, 1000000, /* see ComputeXidHorizons */ - NULL, NULL, NULL - }, - { {"vacuum_failsafe_age", PGC_USERSET, CLIENT_CONN_STATEMENT, gettext_noop("Age at which VACUUM should trigger failsafe to avoid a wraparound outage."), NULL diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index dce5049bc24..06098539958 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -329,7 +329,6 @@ # method to choose sync standbys, number of sync standbys, # and comma-separated list of application_name # from standby(s); '*' = all -#vacuum_defer_cleanup_age = 0 # number of xacts by which cleanup is delayed # - Standby Servers - diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c index 820bddf3159..0bc3d2806b8 100644 --- a/src/bin/pg_upgrade/server.c +++ b/src/bin/pg_upgrade/server.c @@ -234,9 +234,6 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error) * we only modify the new cluster, so only use it there. If there is a * crash, the new cluster has to be recreated anyway. fsync=off is a big * win on ext4. - * - * Force vacuum_defer_cleanup_age to 0 on the new cluster, so that - * vacuumdb --freeze actually freezes the tuples. */ snprintf(cmd, sizeof(cmd), "\"%s/pg_ctl\" -w -l \"%s/%s\" -D \"%s\" -o \"-p %d -b%s %s%s\" start", @@ -244,7 +241,7 @@ start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error) log_opts.logdir, SERVER_LOG_FILE, cluster->pgconfig, cluster->port, (cluster == &new_cluster) ? - " -c synchronous_commit=off -c fsync=off -c full_page_writes=off -c vacuum_defer_cleanup_age=0" : "", + " -c synchronous_commit=off -c fsync=off -c full_page_writes=off" : "", cluster->pgopts ? cluster->pgopts : "", socket_string); /* diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index 41f4dc372e6..e8f50569491 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -21,7 +21,6 @@ #include "storage/standbydefs.h" /* User-settable GUC parameters */ -extern PGDLLIMPORT int vacuum_defer_cleanup_age; extern PGDLLIMPORT int max_standby_archive_delay; extern PGDLLIMPORT int max_standby_streaming_delay; extern PGDLLIMPORT bool log_recovery_conflict_waits; |