Move InRecovery and standbyState global vars to xlogutils.c.
They are used in code that runs both during normal operation and during WAL replay, and needs to behave differently during replay. Move them to xlogutils.c, because that's where we have other helper functions used by redo routines. Reviewed-by: Andres Freund Discussion: https://www.postgresql.org/message-id/b3b71061-4919-e882-4857-27e370ab134a%40iki.fi
This commit is contained in:
parent
4fe8dcdff3
commit
317632f307
|
@ -88,7 +88,7 @@
|
|||
|
||||
#include "access/heapam_xlog.h"
|
||||
#include "access/visibilitymap.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "miscadmin.h"
|
||||
#include "port/pg_bitutils.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "access/htup_details.h"
|
||||
#include "access/slru.h"
|
||||
#include "access/transam.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "funcapi.h"
|
||||
#include "miscadmin.h"
|
||||
|
|
|
@ -74,8 +74,8 @@
|
|||
#include "access/twophase.h"
|
||||
#include "access/twophase_rmgr.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xloginsert.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/pg_type.h"
|
||||
#include "commands/dbcommands.h"
|
||||
#include "funcapi.h"
|
||||
|
|
|
@ -54,6 +54,7 @@
|
|||
#include "access/slru.h"
|
||||
#include "access/transam.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pgstat.h"
|
||||
#include "storage/fd.h"
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "access/subtrans.h"
|
||||
#include "access/transam.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "commands/dbcommands.h"
|
||||
#include "miscadmin.h"
|
||||
#include "postmaster/autovacuum.h"
|
||||
|
|
|
@ -193,22 +193,6 @@ CheckpointStatsData CheckpointStats;
|
|||
*/
|
||||
TimeLineID ThisTimeLineID = 0;
|
||||
|
||||
/*
|
||||
* Are we doing recovery from XLOG?
|
||||
*
|
||||
* This is only ever true in the startup process; it should be read as meaning
|
||||
* "this process is replaying WAL records", rather than "the system is in
|
||||
* recovery mode". It should be examined primarily by functions that need
|
||||
* to act differently when called from a WAL redo function (e.g., to skip WAL
|
||||
* logging). To check whether the system is in recovery regardless of which
|
||||
* process you're running in, use RecoveryInProgress() but only after shared
|
||||
* memory startup and lock initialization.
|
||||
*/
|
||||
bool InRecovery = false;
|
||||
|
||||
/* Are we in Hot Standby mode? Only valid in startup process, see xlog.h */
|
||||
HotStandbyState standbyState = STANDBY_DISABLED;
|
||||
|
||||
static XLogRecPtr LastRec;
|
||||
|
||||
/* Local copy of WalRcv->flushedUpto */
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
#include "access/xlogutils.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pgstat.h"
|
||||
#include "storage/fd.h"
|
||||
#include "storage/smgr.h"
|
||||
#include "utils/guc.h"
|
||||
#include "utils/hsearch.h"
|
||||
|
@ -34,6 +35,25 @@
|
|||
/* GUC variable */
|
||||
bool ignore_invalid_pages = false;
|
||||
|
||||
/*
|
||||
* Are we doing recovery from XLOG?
|
||||
*
|
||||
* This is only ever true in the startup process; it should be read as meaning
|
||||
* "this process is replaying WAL records", rather than "the system is in
|
||||
* recovery mode". It should be examined primarily by functions that need
|
||||
* to act differently when called from a WAL redo function (e.g., to skip WAL
|
||||
* logging). To check whether the system is in recovery regardless of which
|
||||
* process you're running in, use RecoveryInProgress() but only after shared
|
||||
* memory startup and lock initialization.
|
||||
*
|
||||
* This is updated from xlog.c, but lives here because it's mostly read by
|
||||
* WAL redo functions.
|
||||
*/
|
||||
bool InRecovery = false;
|
||||
|
||||
/* Are we in Hot Standby mode? Only valid in startup process, see xlogutils.h */
|
||||
HotStandbyState standbyState = STANDBY_DISABLED;
|
||||
|
||||
/*
|
||||
* During XLOG replay, we may see XLOG records for incremental updates of
|
||||
* pages that no longer exist, because their relation was later dropped or
|
||||
|
|
|
@ -56,8 +56,8 @@
|
|||
#include "access/sysattr.h"
|
||||
#include "access/tableam.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xloginsert.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/dependency.h"
|
||||
#include "catalog/indexing.h"
|
||||
|
|
|
@ -20,6 +20,7 @@
|
|||
#include "postgres.h"
|
||||
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "libpq/pqsignal.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pgstat.h"
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
#include <unistd.h>
|
||||
|
||||
#include "access/tableam.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/storage.h"
|
||||
#include "executor/instrument.h"
|
||||
|
|
|
@ -52,7 +52,7 @@
|
|||
#include "access/transam.h"
|
||||
#include "access/twophase.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "catalog/catalog.h"
|
||||
#include "catalog/pg_authid.h"
|
||||
#include "commands/dbcommands.h"
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
#include "access/transam.h"
|
||||
#include "access/twophase.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xloginsert.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pgstat.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
#include "access/twophase_rmgr.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pg_trace.h"
|
||||
#include "pgstat.h"
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include "access/transam.h"
|
||||
#include "access/twophase.h"
|
||||
#include "access/xact.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "miscadmin.h"
|
||||
#include "pgstat.h"
|
||||
#include "postmaster/autovacuum.h"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
#include "postgres.h"
|
||||
|
||||
#include "access/xlog.h"
|
||||
#include "access/xlogutils.h"
|
||||
#include "lib/ilist.h"
|
||||
#include "storage/bufmgr.h"
|
||||
#include "storage/ipc.h"
|
||||
|
|
|
@ -31,48 +31,6 @@ extern int sync_method;
|
|||
|
||||
extern PGDLLIMPORT TimeLineID ThisTimeLineID; /* current TLI */
|
||||
|
||||
/*
|
||||
* Prior to 8.4, all activity during recovery was carried out by the startup
|
||||
* process. This local variable continues to be used in many parts of the
|
||||
* code to indicate actions taken by RecoveryManagers. Other processes that
|
||||
* potentially perform work during recovery should check RecoveryInProgress().
|
||||
* See XLogCtl notes in xlog.c.
|
||||
*/
|
||||
extern bool InRecovery;
|
||||
|
||||
/*
|
||||
* Like InRecovery, standbyState is only valid in the startup process.
|
||||
* In all other processes it will have the value STANDBY_DISABLED (so
|
||||
* InHotStandby will read as false).
|
||||
*
|
||||
* In DISABLED state, we're performing crash recovery or hot standby was
|
||||
* disabled in postgresql.conf.
|
||||
*
|
||||
* In INITIALIZED state, we've run InitRecoveryTransactionEnvironment, but
|
||||
* we haven't yet processed a RUNNING_XACTS or shutdown-checkpoint WAL record
|
||||
* to initialize our primary-transaction tracking system.
|
||||
*
|
||||
* When the transaction tracking is initialized, we enter the SNAPSHOT_PENDING
|
||||
* state. The tracked information might still be incomplete, so we can't allow
|
||||
* connections yet, but redo functions must update the in-memory state when
|
||||
* appropriate.
|
||||
*
|
||||
* In SNAPSHOT_READY mode, we have full knowledge of transactions that are
|
||||
* (or were) running on the primary at the current WAL location. Snapshots
|
||||
* can be taken, and read-only queries can be run.
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
STANDBY_DISABLED,
|
||||
STANDBY_INITIALIZED,
|
||||
STANDBY_SNAPSHOT_PENDING,
|
||||
STANDBY_SNAPSHOT_READY
|
||||
} HotStandbyState;
|
||||
|
||||
extern HotStandbyState standbyState;
|
||||
|
||||
#define InHotStandby (standbyState >= STANDBY_SNAPSHOT_PENDING)
|
||||
|
||||
/*
|
||||
* Recovery target type.
|
||||
* Only set during a Point in Time recovery, not when in standby mode.
|
||||
|
|
|
@ -14,6 +14,48 @@
|
|||
#include "access/xlogreader.h"
|
||||
#include "storage/bufmgr.h"
|
||||
|
||||
/*
|
||||
* Prior to 8.4, all activity during recovery was carried out by the startup
|
||||
* process. This local variable continues to be used in many parts of the
|
||||
* code to indicate actions taken by RecoveryManagers. Other processes that
|
||||
* potentially perform work during recovery should check RecoveryInProgress().
|
||||
* See XLogCtl notes in xlog.c.
|
||||
*/
|
||||
extern bool InRecovery;
|
||||
|
||||
/*
|
||||
* Like InRecovery, standbyState is only valid in the startup process.
|
||||
* In all other processes it will have the value STANDBY_DISABLED (so
|
||||
* InHotStandby will read as false).
|
||||
*
|
||||
* In DISABLED state, we're performing crash recovery or hot standby was
|
||||
* disabled in postgresql.conf.
|
||||
*
|
||||
* In INITIALIZED state, we've run InitRecoveryTransactionEnvironment, but
|
||||
* we haven't yet processed a RUNNING_XACTS or shutdown-checkpoint WAL record
|
||||
* to initialize our primary-transaction tracking system.
|
||||
*
|
||||
* When the transaction tracking is initialized, we enter the SNAPSHOT_PENDING
|
||||
* state. The tracked information might still be incomplete, so we can't allow
|
||||
* connections yet, but redo functions must update the in-memory state when
|
||||
* appropriate.
|
||||
*
|
||||
* In SNAPSHOT_READY mode, we have full knowledge of transactions that are
|
||||
* (or were) running on the primary at the current WAL location. Snapshots
|
||||
* can be taken, and read-only queries can be run.
|
||||
*/
|
||||
typedef enum
|
||||
{
|
||||
STANDBY_DISABLED,
|
||||
STANDBY_INITIALIZED,
|
||||
STANDBY_SNAPSHOT_PENDING,
|
||||
STANDBY_SNAPSHOT_READY
|
||||
} HotStandbyState;
|
||||
|
||||
extern HotStandbyState standbyState;
|
||||
|
||||
#define InHotStandby (standbyState >= STANDBY_SNAPSHOT_PENDING)
|
||||
|
||||
|
||||
extern bool XLogHaveInvalidPages(void);
|
||||
extern void XLogCheckInvalidPages(void);
|
||||
|
|
Loading…
Reference in New Issue