diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index f017c2ef04..b432914dc8 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -28770,119 +28770,6 @@ postgres=# SELECT '0/0'::pg_lsn + pd.segment_number * ps.setting::int + :offset the pause, the rate of WAL generation and available disk space. - - There are also procedures to control the progress of recovery. - They are shown in . - These procedures may be executed only during recovery. - - - - Recovery Control Procedures - - - - - Procedure - - - Description - - - - - - - - - pg_wal_replay_wait - - pg_wal_replay_wait ( - target_lsn pg_lsn, - timeout bigint DEFAULT 0) - void - - - If timeout is not specified or zero, this - procedure returns once WAL is replayed upto - target_lsn. - If the timeout is specified (in - milliseconds) and greater than zero, the procedure waits until the - server actually replays the WAL upto target_lsn or - until the given time has passed. On timeout, an error is emitted. - - - - -
- - - pg_wal_replay_wait waits till - target_lsn to be replayed on standby. - That is, after this function execution, the value returned by - pg_last_wal_replay_lsn should be greater or equal - to the target_lsn value. This is useful to achieve - read-your-writes-consistency, while using async replica for reads and - primary for writes. In that case lsn of the last - modification should be stored on the client application side or the - connection pooler side. - - - - You can use pg_wal_replay_wait to wait for - the pg_lsn value. For example, an application could update - the movie table and get the lsn after - changes just made. This example uses pg_current_wal_insert_lsn - on primary server to get the lsn given that - synchronous_commit could be set to - off. - - -postgres=# UPDATE movie SET genre = 'Dramatic' WHERE genre = 'Drama'; -UPDATE 100 -postgres=# SELECT pg_current_wal_insert_lsn(); -pg_current_wal_insert_lsn --------------------- -0/306EE20 -(1 row) - - - Then an application could run pg_wal_replay_wait - with the lsn obtained from primary. After that the - changes made of primary should be guaranteed to be visible on replica. - - -postgres=# CALL pg_wal_replay_wait('0/306EE20'); -CALL -postgres=# SELECT * FROM movie WHERE genre = 'Drama'; - genre -------- -(0 rows) - - - It may also happen that target lsn is not achieved - within the timeout. In that case the error is thrown. - - -postgres=# CALL pg_wal_replay_wait('0/306EE20', 100); -ERROR: timed out while waiting for target LSN 0/306EE20 to be replayed; current replay LSN 0/306EA60 - - - - - - pg_wal_replay_wait can't be used within - the transaction, another procedure or function. Any of them holds a - snapshot, which could prevent the replay of WAL records. - - -postgres=# BEGIN; -BEGIN -postgres=*# CALL pg_wal_replay_wait('0/306EE20'); -ERROR: pg_wal_replay_wait() must be only called in non-atomic context -DETAIL: Make sure pg_wal_replay_wait() isn't called within a transaction, another procedure, or a function. - - - diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c index 19777b6895..df5a67e4c3 100644 --- a/src/backend/access/transam/xact.c +++ b/src/backend/access/transam/xact.c @@ -38,7 +38,6 @@ #include "commands/async.h" #include "commands/tablecmds.h" #include "commands/trigger.h" -#include "commands/waitlsn.h" #include "common/pg_prng.h" #include "executor/spi.h" #include "libpq/be-fsstubs.h" @@ -2772,11 +2771,6 @@ AbortTransaction(void) */ LWLockReleaseAll(); - /* - * Cleanup waiting for LSN if any. - */ - WaitLSNCleanup(); - /* Clear wait information and command progress indicator */ pgstat_report_wait_end(); pgstat_progress_end_command(); diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index e3fb26f5ab..34a2c71812 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -66,7 +66,6 @@ #include "catalog/catversion.h" #include "catalog/pg_control.h" #include "catalog/pg_database.h" -#include "commands/waitlsn.h" #include "common/controldata_utils.h" #include "common/file_utils.h" #include "executor/instrument.h" @@ -6130,12 +6129,6 @@ StartupXLOG(void) UpdateControlFile(); LWLockRelease(ControlFileLock); - /* - * Wake up all waiters for replay LSN. They need to report an error that - * recovery was ended before achieving the target LSN. - */ - WaitLSNSetLatches(InvalidXLogRecPtr); - /* * Shutdown the recovery environment. This must occur after * RecoverPreparedTransactions() (see notes in lock_twophase_recover()) diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index b2fe2d04cc..29c5bec084 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -43,7 +43,6 @@ #include "backup/basebackup.h" #include "catalog/pg_control.h" #include "commands/tablespace.h" -#include "commands/waitlsn.h" #include "common/file_utils.h" #include "miscadmin.h" #include "pgstat.h" @@ -1829,16 +1828,6 @@ PerformWalRecovery(void) break; } - /* - * If we replayed an LSN that someone was waiting for then walk - * over the shared memory array and set latches to notify the - * waiters. - */ - if (waitLSN && - (XLogRecoveryCtl->lastReplayedEndRecPtr >= - pg_atomic_read_u64(&waitLSN->minWaitedLSN))) - WaitLSNSetLatches(XLogRecoveryCtl->lastReplayedEndRecPtr); - /* Else, try to fetch the next WAL record */ record = ReadRecord(xlogprefetcher, LOG, false, replayTLI); } while (record != NULL); diff --git a/src/backend/catalog/system_functions.sql b/src/backend/catalog/system_functions.sql index a79bb80c95..fe2bb50f46 100644 --- a/src/backend/catalog/system_functions.sql +++ b/src/backend/catalog/system_functions.sql @@ -414,9 +414,6 @@ CREATE OR REPLACE FUNCTION json_populate_recordset(base anyelement, from_json json, use_json_as_text boolean DEFAULT false) RETURNS SETOF anyelement LANGUAGE internal STABLE ROWS 100 AS 'json_populate_recordset' PARALLEL SAFE; -CREATE OR REPLACE PROCEDURE pg_wal_replay_wait(target_lsn pg_lsn, timeout int8 DEFAULT 0) - LANGUAGE internal AS 'pg_wal_replay_wait'; - CREATE OR REPLACE FUNCTION pg_logical_slot_get_changes( IN slot_name name, IN upto_lsn pg_lsn, IN upto_nchanges int, VARIADIC options text[] DEFAULT '{}', OUT lsn pg_lsn, OUT xid xid, OUT data text) diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile index cede90c3b9..48f7348f91 100644 --- a/src/backend/commands/Makefile +++ b/src/backend/commands/Makefile @@ -61,7 +61,6 @@ OBJS = \ vacuum.o \ vacuumparallel.o \ variable.o \ - view.o \ - waitlsn.o + view.o include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/commands/meson.build b/src/backend/commands/meson.build index 7549be5dc3..6dd00a4abd 100644 --- a/src/backend/commands/meson.build +++ b/src/backend/commands/meson.build @@ -50,5 +50,4 @@ backend_sources += files( 'vacuumparallel.c', 'variable.c', 'view.c', - 'waitlsn.c', ) diff --git a/src/backend/commands/waitlsn.c b/src/backend/commands/waitlsn.c deleted file mode 100644 index 1a83c34e09..0000000000 --- a/src/backend/commands/waitlsn.c +++ /dev/null @@ -1,337 +0,0 @@ -/*------------------------------------------------------------------------- - * - * waitlsn.c - * Implements waiting for the given replay LSN, which is used in - * CALL pg_wal_replay_wait(target_lsn pg_lsn, timeout float8). - * - * Copyright (c) 2024, PostgreSQL Global Development Group - * - * IDENTIFICATION - * src/backend/commands/waitlsn.c - * - *------------------------------------------------------------------------- - */ - -#include "postgres.h" - -#include -#include - -#include "pgstat.h" -#include "access/xlog.h" -#include "access/xlogrecovery.h" -#include "commands/waitlsn.h" -#include "funcapi.h" -#include "miscadmin.h" -#include "storage/latch.h" -#include "storage/proc.h" -#include "storage/shmem.h" -#include "utils/fmgrprotos.h" -#include "utils/pg_lsn.h" -#include "utils/snapmgr.h" -#include "utils/wait_event_types.h" - -static int lsn_cmp(const pairingheap_node *a, const pairingheap_node *b, - void *arg); - -struct WaitLSNState *waitLSN = NULL; - -/* Report the amount of shared memory space needed for WaitLSNState. */ -Size -WaitLSNShmemSize(void) -{ - Size size; - - size = offsetof(WaitLSNState, procInfos); - size = add_size(size, mul_size(MaxBackends, sizeof(WaitLSNProcInfo))); - return size; -} - -/* Initialize the WaitLSNState in the shared memory. */ -void -WaitLSNShmemInit(void) -{ - bool found; - - waitLSN = (WaitLSNState *) ShmemInitStruct("WaitLSNState", - WaitLSNShmemSize(), - &found); - if (!found) - { - pg_atomic_init_u64(&waitLSN->minWaitedLSN, PG_UINT64_MAX); - pairingheap_initialize(&waitLSN->waitersHeap, lsn_cmp, NULL); - memset(&waitLSN->procInfos, 0, MaxBackends * sizeof(WaitLSNProcInfo)); - } -} - -/* - * Comparison function for waitLSN->waitersHeap heap. Waiting processes are - * ordered by lsn, so that the waiter with smallest lsn is at the top. - */ -static int -lsn_cmp(const pairingheap_node *a, const pairingheap_node *b, void *arg) -{ - const WaitLSNProcInfo *aproc = pairingheap_const_container(WaitLSNProcInfo, phNode, a); - const WaitLSNProcInfo *bproc = pairingheap_const_container(WaitLSNProcInfo, phNode, b); - - if (aproc->waitLSN < bproc->waitLSN) - return 1; - else if (aproc->waitLSN > bproc->waitLSN) - return -1; - else - return 0; -} - -/* - * Update waitLSN->minWaitedLSN according to the current state of - * waitLSN->waitersHeap. - */ -static void -updateMinWaitedLSN(void) -{ - XLogRecPtr minWaitedLSN = PG_UINT64_MAX; - - if (!pairingheap_is_empty(&waitLSN->waitersHeap)) - { - pairingheap_node *node = pairingheap_first(&waitLSN->waitersHeap); - - minWaitedLSN = pairingheap_container(WaitLSNProcInfo, phNode, node)->waitLSN; - } - - pg_atomic_write_u64(&waitLSN->minWaitedLSN, minWaitedLSN); -} - -/* - * Put the current process into the heap of LSN waiters. - */ -static void -addLSNWaiter(XLogRecPtr lsn) -{ - WaitLSNProcInfo *procInfo = &waitLSN->procInfos[MyProcNumber]; - - LWLockAcquire(WaitLSNLock, LW_EXCLUSIVE); - - Assert(!procInfo->inHeap); - - procInfo->procnum = MyProcNumber; - procInfo->waitLSN = lsn; - - pairingheap_add(&waitLSN->waitersHeap, &procInfo->phNode); - procInfo->inHeap = true; - updateMinWaitedLSN(); - - LWLockRelease(WaitLSNLock); -} - -/* - * Remove the current process from the heap of LSN waiters if it's there. - */ -static void -deleteLSNWaiter(void) -{ - WaitLSNProcInfo *procInfo = &waitLSN->procInfos[MyProcNumber]; - - LWLockAcquire(WaitLSNLock, LW_EXCLUSIVE); - - if (!procInfo->inHeap) - { - LWLockRelease(WaitLSNLock); - return; - } - - pairingheap_remove(&waitLSN->waitersHeap, &procInfo->phNode); - procInfo->inHeap = false; - updateMinWaitedLSN(); - - LWLockRelease(WaitLSNLock); -} - -/* - * Set latches of LSN waiters whose LSN has been replayed. Set latches of all - * LSN waiters when InvalidXLogRecPtr is given. - */ -void -WaitLSNSetLatches(XLogRecPtr currentLSN) -{ - int i; - int *wakeUpProcNums; - int numWakeUpProcs = 0; - - wakeUpProcNums = palloc(sizeof(int) * MaxBackends); - - LWLockAcquire(WaitLSNLock, LW_EXCLUSIVE); - - /* - * Iterate the pairing heap of waiting processes till we find LSN not yet - * replayed. Record the process numbers to set their latches later. - */ - while (!pairingheap_is_empty(&waitLSN->waitersHeap)) - { - pairingheap_node *node = pairingheap_first(&waitLSN->waitersHeap); - WaitLSNProcInfo *procInfo = pairingheap_container(WaitLSNProcInfo, phNode, node); - - if (!XLogRecPtrIsInvalid(currentLSN) && - procInfo->waitLSN > currentLSN) - break; - - wakeUpProcNums[numWakeUpProcs++] = procInfo->procnum; - (void) pairingheap_remove_first(&waitLSN->waitersHeap); - procInfo->inHeap = false; - } - - updateMinWaitedLSN(); - - LWLockRelease(WaitLSNLock); - - /* - * Set latches for processes, whose waited LSNs are already replayed. This - * involves spinlocks. So, we shouldn't do this under a spinlock. - */ - for (i = 0; i < numWakeUpProcs; i++) - { - PGPROC *backend; - - backend = GetPGProcByNumber(wakeUpProcNums[i]); - SetLatch(&backend->procLatch); - } - pfree(wakeUpProcNums); -} - -/* - * Delete our item from shmem array if any. - */ -void -WaitLSNCleanup(void) -{ - /* - * We do a fast-path check of the 'inHeap' flag without the lock. This - * flag is set to true only by the process itself. So, it's only possible - * to get a false positive. But that will be eliminated by a recheck - * inside deleteLSNWaiter(). - */ - if (waitLSN->procInfos[MyProcNumber].inHeap) - deleteLSNWaiter(); -} - -/* - * Wait using MyLatch till the given LSN is replayed, the postmaster dies or - * timeout happens. - */ -void -WaitForLSN(XLogRecPtr targetLSN, int64 timeout) -{ - XLogRecPtr currentLSN; - TimestampTz endtime = 0; - - /* Shouldn't be called when shmem isn't initialized */ - Assert(waitLSN); - - /* Should be only called by a backend */ - Assert(MyBackendType == B_BACKEND && MyProcNumber <= MaxBackends); - - if (!RecoveryInProgress()) - ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("recovery is not in progress"), - errhint("Waiting for LSN can only be executed during recovery."))); - - /* If target LSN is already replayed, exit immediately */ - if (targetLSN <= GetXLogReplayRecPtr(NULL)) - return; - - if (timeout > 0) - endtime = TimestampTzPlusMilliseconds(GetCurrentTimestamp(), timeout); - - addLSNWaiter(targetLSN); - - for (;;) - { - int rc; - int latch_events = WL_LATCH_SET | WL_EXIT_ON_PM_DEATH; - long delay_ms = 0; - - /* Check if the waited LSN has been replayed */ - currentLSN = GetXLogReplayRecPtr(NULL); - if (targetLSN <= currentLSN) - break; - - /* Recheck that recovery is still in-progress */ - if (!RecoveryInProgress()) - ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("recovery is not in progress"), - errdetail("Recovery ended before replaying the target LSN %X/%X; last replay LSN %X/%X.", - LSN_FORMAT_ARGS(targetLSN), - LSN_FORMAT_ARGS(currentLSN)))); - - if (timeout > 0) - { - delay_ms = (endtime - GetCurrentTimestamp()) / 1000; - latch_events |= WL_TIMEOUT; - if (delay_ms <= 0) - break; - } - - CHECK_FOR_INTERRUPTS(); - - rc = WaitLatch(MyLatch, latch_events, delay_ms, - WAIT_EVENT_WAIT_FOR_WAL_REPLAY); - - if (rc & WL_LATCH_SET) - ResetLatch(MyLatch); - } - - if (targetLSN > currentLSN) - { - deleteLSNWaiter(); - ereport(ERROR, - (errcode(ERRCODE_QUERY_CANCELED), - errmsg("timed out while waiting for target LSN %X/%X to be replayed; current replay LSN %X/%X", - LSN_FORMAT_ARGS(targetLSN), - LSN_FORMAT_ARGS(currentLSN)))); - } -} - -Datum -pg_wal_replay_wait(PG_FUNCTION_ARGS) -{ - XLogRecPtr target_lsn = PG_GETARG_LSN(0); - int64 timeout = PG_GETARG_INT64(1); - CallContext *context = (CallContext *) fcinfo->context; - - if (timeout < 0) - ereport(ERROR, - (errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE), - errmsg("\"timeout\" must not be negative"))); - - /* - * We are going to wait for the LSN replay. We should first care that we - * don't hold a snapshot and correspondingly our MyProc->xmin is invalid. - * Otherwise, our snapshot could prevent the replay of WAL records - * implying a kind of self-deadlock. This is the reason why - * pg_wal_replay_wait() is a procedure, not a function. - * - * At first, we check that pg_wal_replay_wait() is called in a non-atomic - * context. That is, a procedure call isn't wrapped into a transaction, - * another procedure call, or a function call. - * - * Secondly, according to PlannedStmtRequiresSnapshot(), even in an atomic - * context, CallStmt is processed with a snapshot. Thankfully, we can pop - * this snapshot, because PortalRunUtility() can tolerate this. - */ - if (context->atomic) - ereport(ERROR, - (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), - errmsg("pg_wal_replay_wait() must be only called in non-atomic context"), - errdetail("Make sure pg_wal_replay_wait() isn't called within a transaction, another procedure, or a function."))); - - if (ActiveSnapshotSet()) - PopActiveSnapshot(); - Assert(!ActiveSnapshotSet()); - InvalidateCatalogSnapshot(); - Assert(MyProc->xmin == InvalidTransactionId); - - (void) WaitForLSN(target_lsn, timeout); - - PG_RETURN_VOID(); -} diff --git a/src/backend/lib/pairingheap.c b/src/backend/lib/pairingheap.c index 7858e5e076..fe1deba13e 100644 --- a/src/backend/lib/pairingheap.c +++ b/src/backend/lib/pairingheap.c @@ -44,26 +44,12 @@ pairingheap_allocate(pairingheap_comparator compare, void *arg) pairingheap *heap; heap = (pairingheap *) palloc(sizeof(pairingheap)); - pairingheap_initialize(heap, compare, arg); - - return heap; -} - -/* - * pairingheap_initialize - * - * Same as pairingheap_allocate(), but initializes the pairing heap in-place - * rather than allocating a new chunk of memory. Useful to store the pairing - * heap in a shared memory. - */ -void -pairingheap_initialize(pairingheap *heap, pairingheap_comparator compare, - void *arg) -{ heap->ph_compare = compare; heap->ph_arg = arg; heap->ph_root = NULL; + + return heap; } /* diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c index 90c84fec27..521ed5418c 100644 --- a/src/backend/storage/ipc/ipci.c +++ b/src/backend/storage/ipc/ipci.c @@ -25,7 +25,6 @@ #include "access/xlogprefetcher.h" #include "access/xlogrecovery.h" #include "commands/async.h" -#include "commands/waitlsn.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/autovacuum.h" @@ -153,7 +152,6 @@ CalculateShmemSize(int *num_semaphores) size = add_size(size, WaitEventExtensionShmemSize()); size = add_size(size, InjectionPointShmemSize()); size = add_size(size, SlotSyncShmemSize()); - size = add_size(size, WaitLSNShmemSize()); #ifdef EXEC_BACKEND size = add_size(size, ShmemBackendArraySize()); #endif @@ -359,7 +357,6 @@ CreateOrAttachShmemStructs(void) StatsShmemInit(); WaitEventExtensionShmemInit(); InjectionPointShmemInit(); - WaitLSNShmemInit(); } /* diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 4b830dc3c8..162b1f919d 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -36,7 +36,6 @@ #include "access/transam.h" #include "access/twophase.h" #include "access/xlogutils.h" -#include "commands/waitlsn.h" #include "miscadmin.h" #include "pgstat.h" #include "postmaster/autovacuum.h" @@ -863,11 +862,6 @@ ProcKill(int code, Datum arg) */ LWLockReleaseAll(); - /* - * Cleanup waiting for LSN if any. - */ - WaitLSNCleanup(); - /* Cancel any pending condition variable sleep, too */ ConditionVariableCancelSleep(); diff --git a/src/backend/utils/activity/wait_event_names.txt b/src/backend/utils/activity/wait_event_names.txt index f079d660a4..87cbca2811 100644 --- a/src/backend/utils/activity/wait_event_names.txt +++ b/src/backend/utils/activity/wait_event_names.txt @@ -87,7 +87,6 @@ LIBPQWALRECEIVER_CONNECT "Waiting in WAL receiver to establish connection to rem LIBPQWALRECEIVER_RECEIVE "Waiting in WAL receiver to receive data from remote server." SSL_OPEN_SERVER "Waiting for SSL while attempting connection." WAIT_FOR_STANDBY_CONFIRMATION "Waiting for WAL to be received and flushed by the physical standby." -WAIT_FOR_WAL_REPLAY "Waiting for a replay of the particular WAL position on the physical standby." WAL_SENDER_WAIT_FOR_WAL "Waiting for WAL to be flushed in WAL sender process." WAL_SENDER_WRITE_DATA "Waiting for any activity when processing replies from WAL receiver in WAL sender process." @@ -346,7 +345,6 @@ WALSummarizer "Waiting to read or update WAL summarization state." DSMRegistry "Waiting to read or update the dynamic shared memory registry." InjectionPoint "Waiting to read or update information related to injection points." SerialControl "Waiting to read or update shared pg_serial state." -WaitLSN "Waiting to read or update shared Wait-for-LSN state." # # END OF PREDEFINED LWLOCKS (DO NOT CHANGE THIS LINE) diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index f8fab27da9..950f00bed4 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -57,6 +57,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202404022 +#define CATALOG_VERSION_NO 202404021 #endif diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 153d816a05..134e3b22fd 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -12153,11 +12153,6 @@ prorettype => 'bytea', proargtypes => 'pg_brin_minmax_multi_summary', prosrc => 'brin_minmax_multi_summary_send' }, -{ oid => '16387', descr => 'wait for LSN with timeout', - proname => 'pg_wal_replay_wait', prokind => 'p', prorettype => 'void', - proargtypes => 'pg_lsn int8', proargnames => '{target_lsn,timeout}', - prosrc => 'pg_wal_replay_wait' }, - { oid => '6291', descr => 'arbitrary value from among input values', proname => 'any_value', prokind => 'a', proisstrict => 'f', prorettype => 'anyelement', proargtypes => 'anyelement', diff --git a/src/include/commands/waitlsn.h b/src/include/commands/waitlsn.h deleted file mode 100644 index da17b8be6f..0000000000 --- a/src/include/commands/waitlsn.h +++ /dev/null @@ -1,77 +0,0 @@ -/*------------------------------------------------------------------------- - * - * waitlsn.h - * Declarations for LSN replay waiting routines. - * - * Copyright (c) 2024, PostgreSQL Global Development Group - * - * src/include/commands/waitlsn.h - * - *------------------------------------------------------------------------- - */ -#ifndef WAIT_LSN_H -#define WAIT_LSN_H - -#include "lib/pairingheap.h" -#include "postgres.h" -#include "port/atomics.h" -#include "storage/spin.h" -#include "tcop/dest.h" - -/* - * WaitLSNProcInfo – the shared memory structure representing information - * about the single process, which may wait for LSN replay. An item of - * waitLSN->procInfos array. - */ -typedef struct WaitLSNProcInfo -{ - /* - * A process number, same as the index of this item in waitLSN->procInfos. - * Stored for convenience. - */ - int procnum; - - /* LSN, which this process is waiting for */ - XLogRecPtr waitLSN; - - /* A pairing heap node for participation in waitLSN->waitersHeap */ - pairingheap_node phNode; - - /* A flag indicating that this item is added to waitLSN->waitersHeap */ - bool inHeap; -} WaitLSNProcInfo; - -/* - * WaitLSNState - the shared memory state for the replay LSN waiting facility. - */ -typedef struct WaitLSNState -{ - /* - * The minimum LSN value some process is waiting for. Used for the - * fast-path checking if we need to wake up any waiters after replaying a - * WAL record. Could be read lock-less. Update protected by WaitLSNLock. - */ - pg_atomic_uint64 minWaitedLSN; - - /* - * A pairing heap of waiting processes order by LSN values (least LSN is - * on top). Protected by WaitLSNLock. - */ - pairingheap waitersHeap; - - /* - * An array with per-process information, indexed by the process number. - * Protected by WaitLSNLock. - */ - WaitLSNProcInfo procInfos[FLEXIBLE_ARRAY_MEMBER]; -} WaitLSNState; - -extern PGDLLIMPORT struct WaitLSNState *waitLSN; - -extern void WaitForLSN(XLogRecPtr targetLSN, int64 timeout); -extern Size WaitLSNShmemSize(void); -extern void WaitLSNShmemInit(void); -extern void WaitLSNSetLatches(XLogRecPtr currentLSN); -extern void WaitLSNCleanup(void); - -#endif /* WAIT_LSN_H */ diff --git a/src/include/lib/pairingheap.h b/src/include/lib/pairingheap.h index 9e1c26033a..7eade81535 100644 --- a/src/include/lib/pairingheap.h +++ b/src/include/lib/pairingheap.h @@ -77,9 +77,6 @@ typedef struct pairingheap extern pairingheap *pairingheap_allocate(pairingheap_comparator compare, void *arg); -extern void pairingheap_initialize(pairingheap *heap, - pairingheap_comparator compare, - void *arg); extern void pairingheap_free(pairingheap *heap); extern void pairingheap_add(pairingheap *heap, pairingheap_node *node); extern pairingheap_node *pairingheap_first(pairingheap *heap); diff --git a/src/include/storage/lwlocklist.h b/src/include/storage/lwlocklist.h index c2bab5a794..85f6568b9e 100644 --- a/src/include/storage/lwlocklist.h +++ b/src/include/storage/lwlocklist.h @@ -83,4 +83,3 @@ PG_LWLOCK(49, WALSummarizer) PG_LWLOCK(50, DSMRegistry) PG_LWLOCK(51, InjectionPoint) PG_LWLOCK(52, SerialControl) -PG_LWLOCK(53, WaitLSN) diff --git a/src/test/recovery/meson.build b/src/test/recovery/meson.build index 712924c2fa..b1eb77b1ec 100644 --- a/src/test/recovery/meson.build +++ b/src/test/recovery/meson.build @@ -51,7 +51,6 @@ tests += { 't/040_standby_failover_slots_sync.pl', 't/041_checkpoint_at_promote.pl', 't/042_low_level_backup.pl', - 't/043_wal_replay_wait.pl', ], }, } diff --git a/src/test/recovery/t/043_wal_replay_wait.pl b/src/test/recovery/t/043_wal_replay_wait.pl deleted file mode 100644 index bbd64aa67b..0000000000 --- a/src/test/recovery/t/043_wal_replay_wait.pl +++ /dev/null @@ -1,97 +0,0 @@ -# Checks waiting for the lsn replay on standby using -# pg_wal_replay_wait() procedure. -use strict; -use warnings; - -use PostgreSQL::Test::Cluster; -use PostgreSQL::Test::Utils; -use Test::More; - -# Initialize primary node -my $node_primary = PostgreSQL::Test::Cluster->new('primary'); -$node_primary->init(allows_streaming => 1); -$node_primary->start; - -# And some content and take a backup -$node_primary->safe_psql('postgres', - "CREATE TABLE wait_test AS SELECT generate_series(1,10) AS a"); -my $backup_name = 'my_backup'; -$node_primary->backup($backup_name); - -# Create a streaming standby with a 1 second delay from the backup -my $node_standby = PostgreSQL::Test::Cluster->new('standby'); -my $delay = 1; -$node_standby->init_from_backup($node_primary, $backup_name, - has_streaming => 1); -$node_standby->append_conf( - 'postgresql.conf', qq[ - recovery_min_apply_delay = '${delay}s' -]); -$node_standby->start; - - -# Make sure that pg_wal_replay_wait() works: add new content to -# primary and memorize primary's insert LSN, then wait for that LSN to be -# replayed on standby. -$node_primary->safe_psql('postgres', - "INSERT INTO wait_test VALUES (generate_series(11, 20))"); -my $lsn1 = - $node_primary->safe_psql('postgres', "SELECT pg_current_wal_insert_lsn()"); -my $output = $node_standby->safe_psql( - 'postgres', qq[ - CALL pg_wal_replay_wait('${lsn1}', 1000000); - SELECT pg_lsn_cmp(pg_last_wal_replay_lsn(), '${lsn1}'::pg_lsn); -]); - -# Make sure the current LSN on standby is at least as big as the LSN we -# observed on primary's before. -ok($output >= 0, - "standby reached the same LSN as primary after pg_wal_replay_wait()"); - -# Check that new data is visible after calling pg_wal_replay_wait() -$node_primary->safe_psql('postgres', - "INSERT INTO wait_test VALUES (generate_series(21, 30))"); -my $lsn2 = - $node_primary->safe_psql('postgres', "SELECT pg_current_wal_insert_lsn()"); -$output = $node_standby->safe_psql( - 'postgres', qq[ - CALL pg_wal_replay_wait('${lsn2}'); - SELECT count(*) FROM wait_test; -]); - -# Make sure the current LSN on standby and is the same as primary's LSN -ok($output eq 30, "standby reached the same LSN as primary"); - -# Check that waiting for unreachable LSN triggers the timeout. The -# unreachable LSN must be well in advance. So WAL records issued by -# the concurrent autovacuum could not affect that. -my $lsn3 = - $node_primary->safe_psql('postgres', - "SELECT pg_current_wal_insert_lsn() + 10000000000"); -my $stderr; -$node_standby->safe_psql('postgres', - "CALL pg_wal_replay_wait('${lsn2}', 10);"); -$node_standby->psql( - 'postgres', - "CALL pg_wal_replay_wait('${lsn3}', 1000);", - stderr => \$stderr); -ok( $stderr =~ /timed out while waiting for target LSN/, - "get timeout on waiting for unreachable LSN"); - -# Check that the standby promotion terminates the wait on LSN. Start -# waiting for unreachable LSN then promote. Check the log for the relevant -# error message. -my $psql_session = $node_standby->background_psql('postgres'); -$psql_session->query_until( - qr/start/, qq[ - \\echo start - CALL pg_wal_replay_wait('${lsn3}'); -]); - -my $log_offset = -s $node_standby->logfile; -$node_standby->promote; -$node_standby->wait_for_log('recovery is not in progress', $log_offset); - -$node_standby->stop; -$node_primary->stop; -done_testing(); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index d5120d35e9..cf05701c03 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -3091,8 +3091,6 @@ WaitEventIO WaitEventIPC WaitEventSet WaitEventTimeout -WaitLSNProcInfo -WaitLSNState WaitPMResult WalCloseMethod WalCompression