Commiteee6cf1

committed

When a bgworker exits, always call ReleasePostmasterChildSlot.

Commite2ce9aa was insufficientlywell thought out. Repair.

1 parent970d1f7 commiteee6cf1Copy full SHA for eee6cf1

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -2856,23 +2856,25 @@ CleanupBackgroundWorker(int pid,`
`2856`	`2856`	`* backend, any exit status other than 0 or 1 is considered a crash`
`2857`	`2857`	`* and causes a system-wide restart.`
`2858`	`2858`	`*/`
`2859`		`-if (rw->rw_worker.bgw_flags&BGWORKER_SHMEM_ACCESS)`
	`2859`	`+if ((rw->rw_worker.bgw_flags&BGWORKER_SHMEM_ACCESS)!=0)`
`2860`	`2860`	`{`
`2861`	`2861`	`if (!EXIT_STATUS_0(exitstatus)&& !EXIT_STATUS_1(exitstatus))`
`2862`	`2862`	`{`
`2863`	`2863`	`HandleChildCrash(pid,exitstatus,namebuf);`
`2864`	`2864`	`return true;`
`2865`	`2865`	`}`
	`2866`	`+}`
`2866`	`2867`
`2867`		`-if (!ReleasePostmasterChildSlot(rw->rw_child_slot))`
`2868`		`-{`
`2869`		`-/*`
`2870`		`- * Uh-oh, the child failed to clean itself up. Treat as a`
`2871`		`- * crash after all.`
`2872`		`- */`
`2873`		`-HandleChildCrash(pid,exitstatus,namebuf);`
`2874`		`-return true;`
`2875`		`-}`
	`2868`	`+/*`
	`2869`	`+ * We must release the postmaster child slot whether this worker`
	`2870`	`+ * is connected to shared memory or not, but we only treat it as`
	`2871`	`+ * a crash if it is in fact connected.`
	`2872`	`+ */`
	`2873`	`+if (!ReleasePostmasterChildSlot(rw->rw_child_slot)&&`
	`2874`	`+(rw->rw_worker.bgw_flags&BGWORKER_SHMEM_ACCESS)!=0)`
	`2875`	`+{`
	`2876`	`+HandleChildCrash(pid,exitstatus,namebuf);`
	`2877`	`+return true;`
`2876`	`2878`	`}`
`2877`	`2879`
`2878`	`2880`	`/* Get it out of the BackendList and clear out remaining data */`

Comments

(0)