Fix autovacuum launcher attachment to its DSA

alvherre · alvherre · commit a4f06606a328 · 2017-06-22T13:50:26.000-04:00
The autovacuum launcher doesn't actually do anything with its DSA other than creating it and attaching to it, but it's been observed that after longjmp'ing to the standard error handling block (for example after getting SIGINT) the autovacuum enters an infinite loop reporting that it cannot attach to its DSA anymore (which is correct, because it's already attached to it.) Fix by only attempting to attach if not already attached. I introduced this bug together with BRIN autosummarization in 7526e10. Reported-by: Yugo Nagata. Author: Thomas Munro. I added the comment to go with it. Discussion: https://postgr.es/m/20170621211538.0c9eae73.nagata@sraoss.co.jp
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
@@ -612,7 +612,8 @@ AutoVacLauncherMain(int argc, char *argv[])
 
 	/*
 	 * Set up our DSA so that backends can install work-item requests.  It may
-	 * already exist as created by a previous launcher.
+	 * already exist as created by a previous launcher; and we may even be
+	 * already attached to it, if we're here after longjmp'ing above.
 	 */
 	if (!AutoVacuumShmem->av_dsa_handle)
 	{
@@ -626,7 +627,7 @@ AutoVacLauncherMain(int argc, char *argv[])
 		AutoVacuumShmem->av_workitems = InvalidDsaPointer;
 		LWLockRelease(AutovacuumLock);
 	}
-	else
+	else if (AutoVacuumDSA == NULL)
 	{
 		AutoVacuumDSA = dsa_attach(AutoVacuumShmem->av_dsa_handle);
 		dsa_pin_mapping(AutoVacuumDSA);

Original file line number	Diff line number	Diff line change
`@@ -612,7 +612,8 @@ AutoVacLauncherMain(int argc, char *argv[])`
`612`	`612`
`613`	`613`	`/*`
`614`	`614`	`* Set up our DSA so that backends can install work-item requests. It may`
`615`		`- * already exist as created by a previous launcher.`
	`615`	`+ * already exist as created by a previous launcher; and we may even be`
	`616`	`+ * already attached to it, if we're here after longjmp'ing above.`
`616`	`617`	`*/`
`617`	`618`	`if (!AutoVacuumShmem->av_dsa_handle)`
`618`	`619`	`{`
`@@ -626,7 +627,7 @@ AutoVacLauncherMain(int argc, char *argv[])`
`626`	`627`	`AutoVacuumShmem->av_workitems = InvalidDsaPointer;`
`627`	`628`	`LWLockRelease(AutovacuumLock);`
`628`	`629`	`}`
`629`		`- else`
	`630`	`+ else if (AutoVacuumDSA == NULL)`
`630`	`631`	`{`
`631`	`632`	`AutoVacuumDSA = dsa_attach(AutoVacuumShmem->av_dsa_handle);`
`632`	`633`	`dsa_pin_mapping(AutoVacuumDSA);`