Fix returning bgworkers-turned-walsenders to freelist

Heikki Linnakangas · Heikki Linnakangas · commit 1c44e356f6e6 · 2025-09-08T19:06:04.000+03:00
diff --git a/src/backend/postmaster/pmchild.c b/src/backend/postmaster/pmchild.c
@@ -258,8 +258,8 @@ ReleasePostmasterChildSlot(PMChild *pmchild)
 			 * WalSender, so make sure we release the child back to the right
 			 * pool.
 			 */
-			if (pmchild->pid < pool->first_slotno &&
-				pmchild->pid >= pool->first_slotno + pool->size)
+			if (pmchild->child_slot >= pmchild_pools[B_BG_WORKER].first_slotno &&
+				pmchild->child_slot < pmchild_pools[B_BG_WORKER].first_slotno + pmchild_pools[B_BG_WORKER].size)
 			{
 				pool = &pmchild_pools[B_BG_WORKER];
 			}

Original file line number	Diff line number	Diff line change
`@@ -258,8 +258,8 @@ ReleasePostmasterChildSlot(PMChild *pmchild)`
`258`	`258`	`* WalSender, so make sure we release the child back to the right`
`259`	`259`	`* pool.`
`260`	`260`	`*/`
`261`		`- if (pmchild->pid < pool->first_slotno &&`
`262`		`- pmchild->pid >= pool->first_slotno + pool->size)`
	`261`	`+ if (pmchild->child_slot >= pmchild_pools[B_BG_WORKER].first_slotno &&`
	`262`	`+ pmchild->child_slot < pmchild_pools[B_BG_WORKER].first_slotno + pmchild_pools[B_BG_WORKER].size)`
`263`	`263`	`{`
`264`	`264`	`pool = &pmchild_pools[B_BG_WORKER];`
`265`	`265`	`}`