postgres.git / summary / log / commit / refs

commit    2fc5c5062207a26b4ea4144a3d70099767eee523
Author:   Nathan Bossart <nathan@postgresql.org>
Date:     Wed Nov 26 21:12:25 2025 +0000
First released in: 17.8, 18.2

    Teach DSM registry to retry entry initialization if needed.
    
    If DSM registry entry initialization fails, backends could try to
    use an uninitialized DSM segment, DSA, or dshash table (since the
    entry is still added to the registry).  To fix, restructure the
    code so that the registry retries initialization as needed.  This
    commit also modifies pg_get_dsm_registry_allocations() to leave out
    partially-initialized entries, as they shouldn't have any allocated
    memory.
    
    DSM registry entry initialization shouldn't fail often in practice,
    but retrying was deemed better than leaving entries in a
    permanently failed state (as was done by commit 1165a933aa, which
    has since been reverted).
    
    Suggested-by: Robert Haas <robertmhaas@gmail.com>
    Reviewed-by: Robert Haas <robertmhaas@gmail.com>
    Discussion: https://postgr.es/m/E1vJHUk-006I7r-37%40gemulon.postgresql.org
    Backpatch-through: 17


 src/backend/storage/ipc/dsm_registry.c | 37 ++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/backend/storage/ipc/dsm_registry.c b/src/backend/storage/ipc/dsm_registry.c
index 9f58ea611b9..729d3135f70 100644
--- a/src/backend/storage/ipc/dsm_registry.c
+++ b/src/backend/storage/ipc/dsm_registry.c
@@ -101,9 +101,10 @@ init_dsm_registry(void)
 	{
 		/* Initialize dynamic shared hash table for registry. */
 		dsm_registry_dsa = dsa_create(LWTRANCHE_DSM_REGISTRY_DSA);
+		dsm_registry_table = dshash_create(dsm_registry_dsa, &dsh_params, NULL);
+
 		dsa_pin(dsm_registry_dsa);
 		dsa_pin_mapping(dsm_registry_dsa);
-		dsm_registry_table = dshash_create(dsm_registry_dsa, &dsh_params, NULL);
 
 		/* Store handles in shared memory for other backends to use. */
 		DSMRegistryCtx->dsah = dsa_get_handle(dsm_registry_dsa);
@@ -134,6 +135,7 @@ GetNamedDSMSegment(const char *name, size_t size,
 	DSMRegistryEntry *entry;
 	MemoryContext oldcontext;
 	void	   *ret;
+	dsm_segment *seg;
 
 	Assert(found);
 
@@ -158,29 +160,31 @@ GetNamedDSMSegment(const char *name, size_t size,
 	entry = dshash_find_or_insert(dsm_registry_table, name, found);
 	if (!(*found))
 	{
+		entry->handle = DSM_HANDLE_INVALID;
+		entry->size = size;
+	}
+	else if (entry->size != size)
+		ereport(ERROR,
+				(errmsg("requested DSM segment size does not match size of existing segment")));
+
+	if (entry->handle == DSM_HANDLE_INVALID)
+	{
+		*found = false;
+
 		/* Initialize the segment. */
-		dsm_segment *seg = dsm_create(size, 0);
+		seg = dsm_create(size, 0);
+
+		if (init_callback)
+			(*init_callback) (dsm_segment_address(seg));
 
 		dsm_pin_segment(seg);
 		dsm_pin_mapping(seg);
 		entry->handle = dsm_segment_handle(seg);
-		entry->size = size;
-		ret = dsm_segment_address(seg);
-
-		if (init_callback)
-			(*init_callback) (ret);
-	}
-	else if (entry->size != size)
-	{
-		ereport(ERROR,
-				(errmsg("requested DSM segment size does not match size of "
-						"existing segment")));
 	}
 	else
 	{
-		dsm_segment *seg = dsm_find_mapping(entry->handle);
-
 		/* If the existing segment is not already attached, attach it now. */
+		seg = dsm_find_mapping(entry->handle);
 		if (seg == NULL)
 		{
 			seg = dsm_attach(entry->handle);
@@ -189,10 +193,9 @@ GetNamedDSMSegment(const char *name, size_t size,
 
 			dsm_pin_mapping(seg);
 		}
-
-		ret = dsm_segment_address(seg);
 	}
 
+	ret = dsm_segment_address(seg);
 	dshash_release_lock(dsm_registry_table, entry);
 	MemoryContextSwitchTo(oldcontext);
 


[parent: c7e0f263d67f]