postgres.git / summary / log / commit / refs

commit    a9c3472e02c853b5fa577707243c310c2ec72317
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Sun Jun 11 01:34:00 2023 +0000
First released in: 11.21, 12.16, 13.12, 14.9

    Fix missing initializations of MyProc.delayChkptEnd
    
    This commit fixes an oversight introduced in 10520f4, that has added
    delayChkptEnd to PGPROC to avoid ABI breakages on stable branches, where
    two spots have missed to initialize this variable (delayChkpt was
    switched back from int to bool, and it was initialized as 0 so there was
    no consequences for it):
    - InitProcess(), where the per-process data structures of a backend are
    initialized.
    - InitAuxiliaryProcess(), same but for auxiliary processes.
    
    An interruption during relation truncation while this flag is set could
    cause an assertion failure when a follow-up process does a relation
    truncation while reusing the same PGPROC entry.  A second effect could
    be incorrect checkpoint end delays.
    
    While on it, add an assertion in ProcArrayClearTransaction() for
    delayChkptEnd to be in line with 5788e25.  This is needed only for v14.
    
    This issue affects v11~v14, but not v15~, as we use a single field
    called delayChkptFlags to delay checkpoints there.
    
    Author: suyu.cmj (mengjuan.cmj@alibaba-inc.com)
    Reviewed-by: Kyotaro Horiguchi, Michael Paquier
    Discussion: https://postgr.es/m/9c3d2a49-db5f-43cb-840b-d58f9a684295.mengjuan.cmj@alibaba-inc.com
    Backpatch-through: 11


 src/backend/storage/ipc/procarray.c | 1 +
 src/backend/storage/lmgr/proc.c     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index 596c59ba561..f1fccfd9d79 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -649,6 +649,7 @@ ProcArrayClearTransaction(PGPROC *proc)
 	/* redundant, but just in case */
 	pgxact->vacuumFlags &= ~PROC_VACUUM_STATE_MASK;
 	pgxact->delayChkpt = false;
+	proc->delayChkptEnd = false;
 
 	/* Clear the subtransaction-XID cache too */
 	pgxact->nxids = 0;
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index adc839933e0..9ff26c45c2e 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -380,7 +380,8 @@ InitProcess(void)
 	MyProc->roleId = InvalidOid;
 	MyProc->tempNamespaceId = InvalidOid;
 	MyProc->isBackgroundWorker = IsBackgroundWorker;
-	MyPgXact->delayChkpt = 0;
+	MyPgXact->delayChkpt = false;
+	MyProc->delayChkptEnd = false;
 	MyPgXact->vacuumFlags = 0;
 	/* NB -- autovac launcher intentionally does not set IS_AUTOVACUUM */
 	if (IsAutoVacuumWorkerProcess())
@@ -562,7 +563,8 @@ InitAuxiliaryProcess(void)
 	MyProc->roleId = InvalidOid;
 	MyProc->tempNamespaceId = InvalidOid;
 	MyProc->isBackgroundWorker = IsBackgroundWorker;
-	MyPgXact->delayChkpt = 0;
+	MyPgXact->delayChkpt = false;
+	MyProc->delayChkptEnd = false;
 	MyPgXact->vacuumFlags = 0;
 	MyProc->lwWaiting = false;
 	MyProc->lwWaitMode = 0;


[parent: ced4cc30d5de]