8000 Fix missing initializations of MyProc.delayChkptEnd · postgres/postgres@a9c3472 · GitHub
[go: up one dir, main page]
Skip to content

Commit a9c3472

Browse files
michaelpqmichaelpq
committed
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
1 parent ced4cc3 commit a9c3472

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

‎src/backend/storage/ipc/procarray.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ ProcArrayClearTransaction(PGPROC *proc)
649649
/* redundant, but just in case */
650650
pgxact->vacuumFlags &= ~PROC_VACUUM_STATE_MASK;
651651
pgxact->delayChkpt = false;
652+
proc->delayChkptEnd = false;
652653

653654
/* Clear the subtransaction-XID cache too */
654655
pgxact->nxids = 0;

‎src/backend/storage/lmgr/proc.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,8 @@ InitProcess(void)
380380
MyProc->roleId = InvalidOid;
381381
MyProc->tempNamespaceId = InvalidOid;
382382
MyProc->isBackgroundWorker = IsBackgroundWorker;
383-
MyPgXact->delayChkpt = 0;
383+
MyPgXact->delayChkpt = false;
384+
MyProc->delayChkptEnd = false;
384385
MyPgXact->vacuumFlags = 0;
385386
/* NB -- autovac launcher intentionally does not set IS_AUTOVACUUM */
386387
if (IsAutoVacuumWorkerProcess())
@@ -562,7 +563,8 @@ InitAuxiliaryProcess(void)
562563
MyProc->roleId = InvalidOid;
563564
MyProc->tempNamespaceId = InvalidOid;
564565
MyProc->isBackgroundWorker = IsBackgroundWorker;
565-
MyPgXact->delayChkpt = 0;
566+
MyPgXact->delayChkpt = false;
567+
MyProc->delayChkptEnd = false;
566568
MyPgXact->vacuumFlags = 0;
567569
MyProc->lwWaiting = false;
568570
MyProc->lwWaitMode = 0;

0 commit comments

Comments
 (0)
0