NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit37dc228

committed

Fix autovacuum launcher shutdown sequence

It was previously possible to have the launcher re-execute its main loopbefore shutting down if some other signal was received or an erroroccurred after getting SIGTERM, as reported by Qingqing Zhou.While investigating, Tom Lane further noticed that if autovacuum hadbeen disabled in the config file, it would misbehave by trying to starta new worker instead of bailing out immediately -- it would consideritself as invoked in emergency mode.Fix both problems by checking the shutdown flag in a few more places.These problems have existed since autovacuum was introduced, sobackpatch all the way back.

1 parent6a560f5 commit37dc228Copy full SHA for 37dc228

File tree

1 file changed

+13

-3

lines changed

src/backend/postmaster
- autovacuum.c

1 file changed

+13

-3

lines changed

`‎src/backend/postmaster/autovacuum.c`

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -518,6 +518,10 @@ AutoVacLauncherMain(int argc, char *argv[])`
`518`	`518`	`/* Now we can allow interrupts again */`
`519`	`519`	`RESUME_INTERRUPTS();`
`520`	`520`
	`521`	`+/* if in shutdown mode, no need for anything further; just go away */`
	`522`	`+if (got_SIGTERM)`
	`523`	`+gotoshutdown;`
	`524`	`+`
`521`	`525`	`/*`
`522`	`526`	`* Sleep at least 1 second after any error. We don't want to be`
`523`	`527`	`* filling the error logs as fast as we can.`
`@@ -552,10 +556,14 @@ AutoVacLauncherMain(int argc, char *argv[])`
`552`	`556`	`SetConfigOption("default_transaction_isolation","read committed",`
`553`	`557`	`PGC_SUSET,PGC_S_OVERRIDE);`
`554`	`558`
`555`		`-/* in emergency mode, just start a worker and go away */`
	`559`	`+/*`
	`560`	`+ * In emergency mode, just start a worker (unless shutdown was requested)`
	`561`	`+ * and go away.`
	`562`	`+ */`
`556`	`563`	`if (!AutoVacuumingActive())`
`557`	`564`	`{`
`558`		`-do_start_worker();`
	`565`	`+if (!got_SIGTERM)`
	`566`	`+do_start_worker();`
`559`	`567`	`proc_exit(0);/* done */`
`560`	`568`	`}`
`561`	`569`
`@@ -570,7 +578,8 @@ AutoVacLauncherMain(int argc, char *argv[])`
`570`	`578`	`*/`
`571`	`579`	`rebuild_database_list(InvalidOid);`
`572`	`580`
`573`		`-for (;;)`
	`581`	`+/* loop until shutdown request */`
	`582`	`+while (!got_SIGTERM)`
`574`	`583`	`{`
`575`	`584`	`structtimevalnap;`
`576`	`585`	`TimestampTzcurrent_time=0;`
`@@ -765,6 +774,7 @@ AutoVacLauncherMain(int argc, char *argv[])`
`765`	`774`	`}`
`766`	`775`
`767`	`776`	`/* Normal exit from the autovac launcher is here */`
	`777`	`+shutdown:`
`768`	`778`	`ereport(LOG,`
`769`	`779`	`(errmsg("autovacuum launcher shutting down")));`
`770`	`780`	`AutoVacuumShmem->av_launcherpid=0;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit37dc228

File tree

1 file changed

1 file changed

`‎src/backend/postmaster/autovacuum.c`

0 commit comments