dsm: allow use in single user mode.

anarazel · anarazel · commit 46a2d2499a64 · 2022-04-06T12:40:04.000-07:00
It might seem pointless to allow use of dsm in single user mode, but otherwise subsystems might need dedicated single user mode code paths. Besides changing the assert, all that's needed is to make some windows code assuming the presence of postmaster conditional. Author: Andres Freund <andres@anarazel.de> Reviewed-By: Thomas Munro <thomas.munro@gmail.com> Discussion: https://postgr.es/m/CA+hUKGL9hY_VY=+oUK+Gc1iSRx-Ls5qeYJ6q=dQVZnT3R63Taw@mail.gmail.com
diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c
@@ -397,6 +397,7 @@ static void
 dsm_backend_startup(void)
 {
 #ifdef EXEC_BACKEND
+	if (IsUnderPostmaster)
 	{
 		void	   *control_address = NULL;
 
@@ -496,8 +497,12 @@ dsm_create(Size size, int flags)
 	FreePageManager *dsm_main_space_fpm = dsm_main_space_begin;
 	bool		using_main_dsm_region = false;
 
-	/* Unsafe in postmaster (and pointless in a stand-alone backend). */
-	Assert(IsUnderPostmaster);
+	/*
+	 * Unsafe in postmaster. It might seem pointless to allow use of dsm in
+	 * single user mode, but otherwise some subsystems will need dedicated
+	 * single user mode code paths.
+	 */
+	Assert(IsUnderPostmaster || !IsPostmasterEnvironment);
 
 	if (!dsm_init_done)
 		dsm_backend_startup();
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
@@ -959,6 +959,7 @@ dsm_impl_pin_segment(dsm_handle handle, void *impl_private,
 	{
 #ifdef USE_DSM_WINDOWS
 		case DSM_IMPL_WINDOWS:
+			if (IsUnderPostmaster)
 			{
 				HANDLE		hmap;
 
@@ -984,8 +985,8 @@ dsm_impl_pin_segment(dsm_handle handle, void *impl_private,
 				 * is unpinned, dsm_impl_unpin_segment can close it.
 				 */
 				*impl_private_pm_handle = hmap;
-				break;
 			}
+			break;
 #endif
 		default:
 			break;
@@ -1008,6 +1009,7 @@ dsm_impl_unpin_segment(dsm_handle handle, void **impl_private)
 	{
 #ifdef USE_DSM_WINDOWS
 		case DSM_IMPL_WINDOWS:
+			if (IsUnderPostmaster)
 			{
 				if (*impl_private &&
 					!DuplicateHandle(PostmasterHandle, *impl_private,
@@ -1025,8 +1027,8 @@ dsm_impl_unpin_segment(dsm_handle handle, void **impl_private)
 				}
 
 				*impl_private = NULL;
-				break;
 			}
+			break;
 #endif
 		default:
 			break;

Original file line number	Diff line number	Diff line change
`@@ -959,6 +959,7 @@ dsm_impl_pin_segment(dsm_handle handle, void *impl_private,`
`959`	`959`	`{`
`960`	`960`	`#ifdef USE_DSM_WINDOWS`
`961`	`961`	`case DSM_IMPL_WINDOWS:`
	`962`	`+ if (IsUnderPostmaster)`
`962`	`963`	`{`
`963`	`964`	`HANDLE hmap;`
`964`	`965`
`@@ -984,8 +985,8 @@ dsm_impl_pin_segment(dsm_handle handle, void *impl_private,`
`984`	`985`	`* is unpinned, dsm_impl_unpin_segment can close it.`
`985`	`986`	`*/`
`986`	`987`	`*impl_private_pm_handle = hmap;`
`987`		`- break;`
`988`	`988`	`}`
	`989`	`+ break;`
`989`	`990`	`#endif`
`990`	`991`	`default:`
`991`	`992`	`break;`
`@@ -1008,6 +1009,7 @@ dsm_impl_unpin_segment(dsm_handle handle, void **impl_private)`
`1008`	`1009`	`{`
`1009`	`1010`	`#ifdef USE_DSM_WINDOWS`
`1010`	`1011`	`case DSM_IMPL_WINDOWS:`
	`1012`	`+ if (IsUnderPostmaster)`
`1011`	`1013`	`{`
`1012`	`1014`	`if (*impl_private &&`
`1013`	`1015`	`!DuplicateHandle(PostmasterHandle, *impl_private,`
`@@ -1025,8 +1027,8 @@ dsm_impl_unpin_segment(dsm_handle handle, void **impl_private)`
`1025`	`1027`	`}`
`1026`	`1028`
`1027`	`1029`	`*impl_private = NULL;`
`1028`		`- break;`
`1029`	`1030`	`}`
	`1031`	`+ break;`
`1030`	`1032`	`#endif`
`1031`	`1033`	`default:`
`1032`	`1034`	`break;`