Fix checkpointer crash in EXEC_BACKEND builds.
Nothing in the checkpointer calls InitXLOGAccess(), so WALInsertLocks never got initialized there. Without EXEC_BACKEND, it works anyway because the correct value is inherited from the postmaster, but with EXEC_BACKEND we've got a problem. The problem appears to have been introduced by commit 68a2e52bbaf98f136a96b3a0d734ca52ca440a95. To fix, move the relevant initialization steps from InitXLOGAccess() to XLOGShmemInit(), making this more parallel to what we do elsewhere. Amit Kapila
This commit is contained in:
parent
93a028f569
commit
250c26ba9c
@ -4841,6 +4841,11 @@ XLOGShmemInit(void)
|
||||
{
|
||||
/* both should be present or neither */
|
||||
Assert(foundCFile && foundXLog);
|
||||
|
||||
/* Initialize local copy of WALInsertLocks and register the tranche */
|
||||
WALInsertLocks = XLogCtl->Insert.WALInsertLocks;
|
||||
LWLockRegisterTranche(XLogCtl->Insert.WALInsertLockTrancheId,
|
||||
&XLogCtl->Insert.WALInsertLockTranche);
|
||||
return;
|
||||
}
|
||||
memset(XLogCtl, 0, sizeof(XLogCtlData));
|
||||
@ -7619,11 +7624,6 @@ InitXLOGAccess(void)
|
||||
ThisTimeLineID = XLogCtl->ThisTimeLineID;
|
||||
Assert(ThisTimeLineID != 0 || IsBootstrapProcessingMode());
|
||||
|
||||
/* Initialize our copy of WALInsertLocks and register the tranche */
|
||||
WALInsertLocks = XLogCtl->Insert.WALInsertLocks;
|
||||
LWLockRegisterTranche(XLogCtl->Insert.WALInsertLockTrancheId,
|
||||
&XLogCtl->Insert.WALInsertLockTranche);
|
||||
|
||||
/* Use GetRedoRecPtr to copy the RedoRecPtr safely */
|
||||
(void) GetRedoRecPtr();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user