database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-18 04:29:09 +03:00
Code Activity

Fix re-initialization of LWLock-related shared memory.

Browse Source 
When shared memory is re-initialized after a crash, the named
LWLock tranche request array that was copied to shared memory will
no longer be accessible.  To fix, save the pointer to the original
array in postmaster's local memory, and switch to it when
re-initializing the LWLock-related shared memory.

Oversight in commit ed1aad15e0.  Per buildfarm member batta.

Reported-by: Michael Paquier <michael@paquier.xyz>
Reported-by: Alexander Lakhin <exclusion@gmail.com>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/aMoejB3iTWy1SxfF%40paquier.xyz
Discussion: https://postgr.es/m/f8ca018f-3479-49f6-a92c-e31db9f849d7%40gmail.com
This commit is contained in:
Nathan Bossart
2025-09-18 09:55:39 -05:00
parent 2e66cae935
commit c3cc2ab87d
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/storage/lmgr/lwlock.c
View File

@@ -192,6 +192,9 @@ typedef struct NamedLWLockTrancheRequest
int NamedLWLockTrancheRequests = 0;
NamedLWLockTrancheRequest *NamedLWLockTrancheRequestArray = NULL;
/* postmaster's local copy of the request array */
static NamedLWLockTrancheRequest *LocalNamedLWLockTrancheRequestArray = NULL;
/* shared memory counter of registered tranches */
int *LWLockCounter = NULL;
@@ -396,6 +399,15 @@ LWLockShmemSize(void)
Size size;
int numLocks = NUM_FIXED_LWLOCKS;
/*
* If re-initializing shared memory, the request array will no longer be
* accessible, so switch to the copy in postmaster's local memory. We'll
* copy it back into shared memory later when CreateLWLocks() is called
* again.
*/
if (LocalNamedLWLockTrancheRequestArray)
NamedLWLockTrancheRequestArray = LocalNamedLWLockTrancheRequestArray;
/* Calculate total number of locks needed in the main array. */
numLocks += NumLWLocksForNamedTranches();
@@ -457,9 +469,15 @@ CreateLWLocks(void)
*/
if (NamedLWLockTrancheRequests > 0)
{
/*
* Save the pointer to the request array in postmaster's local
* memory. We'll need it if we ever need to re-initialize shared
* memory after a crash.
*/
LocalNamedLWLockTrancheRequestArray = NamedLWLockTrancheRequestArray;
memcpy(ptr, NamedLWLockTrancheRequestArray,
NamedLWLockTrancheRequests * sizeof(NamedLWLockTrancheRequest));
pfree(NamedLWLockTrancheRequestArray);
NamedLWLockTrancheRequestArray = (NamedLWLockTrancheRequest *) ptr;
ptr += NamedLWLockTrancheRequests * sizeof(NamedLWLockTrancheRequest);
}