NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commit421d502

committed

Treat the autovac launcher more like a regular backend, in that we wait

for it to die before telling the bgwriter to initiate shutdown checkpoint.Since it's connected to shared memory, this seems more prudent than thealternative of letting it quit asynchronously. Resolves my complaintof yesterday about repeated shutdown checkpoints in CVS HEAD.

1 parent8f55b9a commit421d502Copy full SHA for 421d502

File tree

1 file changed

+12

-27

lines changed

src/backend/postmaster
- postmaster.c

1 file changed

+12

-27

lines changed

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

Lines changed: 12 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`*`
`38`	`38`	`*`
`39`	`39`	`* IDENTIFICATION`
`40`		`- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.529 2007/06/29 17:07:39 alvherre Exp $`
	`40`	`+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.530 2007/07/01 18:28:41 tgl Exp $`
`41`	`41`	`*`
`42`	`42`	`* NOTES`
`43`	`43`	`*`
`@@ -1242,7 +1242,8 @@ ServerLoop(void)`
`1242`	`1242`	`}`
`1243`	`1243`
`1244`	`1244`	`/* If we have lost the autovacuum launcher, try to start a new one */`
`1245`		`-if ((AutoVacuumingActive()\|\|start_autovac_launcher)&&AutoVacPID==0&&`
	`1245`	`+if (AutoVacPID==0&&`
	`1246`	`+(AutoVacuumingActive()\|\|start_autovac_launcher)&&`
`1246`	`1247`	`StartupPID==0&& !FatalError&&Shutdown==NoShutdown)`
`1247`	`1248`	`{`
`1248`	`1249`	`AutoVacPID=StartAutoVacLauncher();`
`@@ -1873,11 +1874,14 @@ pmdie(SIGNAL_ARGS)`
`1873`	`1874`	`ereport(LOG,`
`1874`	`1875`	`(errmsg("received smart shutdown request")));`
`1875`	`1876`
`1876`		`-/* autovacuum workers are shut down immediately */`
	`1877`	`+/* autovacuum workers aretold toshut down immediately */`
`1877`	`1878`	`if (DLGetHead(BackendList))`
`1878`	`1879`	`SignalSomeChildren(SIGTERM, true);`
	`1880`	`+/* and the autovac launcher too */`
	`1881`	`+if (AutoVacPID!=0)`
	`1882`	`+signal_child(AutoVacPID,SIGTERM);`
`1879`	`1883`
`1880`		`-if (DLGetHead(BackendList))`
	`1884`	`+if (DLGetHead(BackendList)\|\|AutoVacPID!=0)`
`1881`	`1885`	`break;/* let reaper() handle this */`
`1882`	`1886`
`1883`	`1887`	`/*`
`@@ -1896,13 +1900,7 @@ pmdie(SIGNAL_ARGS)`
`1896`	`1900`	`signal_child(PgArchPID,SIGQUIT);`
`1897`	`1901`	`/* Tell pgstat to shut down too; nothing left for it to do */`
`1898`	`1902`	`if (PgStatPID!=0)`
`1899`		`-{`
`1900`	`1903`	`signal_child(PgStatPID,SIGQUIT);`
`1901`		`-allow_immediate_pgstat_restart();`
`1902`		`-}`
`1903`		`-/* Tell autovac launcher to shut down too */`
`1904`		`-if (AutoVacPID!=0)`
`1905`		`-signal_child(AutoVacPID,SIGTERM);`
`1906`	`1904`	`break;`
`1907`	`1905`
`1908`	`1906`	`caseSIGINT:`
`@@ -1919,13 +1917,15 @@ pmdie(SIGNAL_ARGS)`
`1919`	`1917`	`ereport(LOG,`
`1920`	`1918`	`(errmsg("received fast shutdown request")));`
`1921`	`1919`
`1922`		`-if (DLGetHead(BackendList))`
	`1920`	`+if (DLGetHead(BackendList)\|\|AutoVacPID!=0)`
`1923`	`1921`	`{`
`1924`	`1922`	`if (!FatalError)`
`1925`	`1923`	`{`
`1926`	`1924`	`ereport(LOG,`
`1927`	`1925`	`(errmsg("aborting any active transactions")));`
`1928`	`1926`	`SignalChildren(SIGTERM);`
	`1927`	`+if (AutoVacPID!=0)`
	`1928`	`+signal_child(AutoVacPID,SIGTERM);`
`1929`	`1929`	`/* reaper() does the rest */`
`1930`	`1930`	`}`
`1931`	`1931`	`break;`
`@@ -1955,13 +1955,7 @@ pmdie(SIGNAL_ARGS)`
`1955`	`1955`	`signal_child(PgArchPID,SIGQUIT);`
`1956`	`1956`	`/* Tell pgstat to shut down too; nothing left for it to do */`
`1957`	`1957`	`if (PgStatPID!=0)`
`1958`		`-{`
`1959`	`1958`	`signal_child(PgStatPID,SIGQUIT);`
`1960`		`-allow_immediate_pgstat_restart();`
`1961`		`-}`
`1962`		`-/* Tell autovac launcher to shut down too */`
`1963`		`-if (AutoVacPID!=0)`
`1964`		`-signal_child(AutoVacPID,SIGTERM);`
`1965`	`1959`	`break;`
`1966`	`1960`
`1967`	`1961`	`caseSIGQUIT:`
`@@ -1983,10 +1977,7 @@ pmdie(SIGNAL_ARGS)`
`1983`	`1977`	`if (PgArchPID!=0)`
`1984`	`1978`	`signal_child(PgArchPID,SIGQUIT);`
`1985`	`1979`	`if (PgStatPID!=0)`
`1986`		`-{`
`1987`	`1980`	`signal_child(PgStatPID,SIGQUIT);`
`1988`		`-allow_immediate_pgstat_restart();`
`1989`		`-}`
`1990`	`1981`	`if (DLGetHead(BackendList))`
`1991`	`1982`	`SignalChildren(SIGQUIT);`
`1992`	`1983`	`ExitPostmaster(0);`
`@@ -2237,7 +2228,7 @@ reaper(SIGNAL_ARGS)`
`2237`	`2228`
`2238`	`2229`	`if (Shutdown>NoShutdown)`
`2239`	`2230`	`{`
`2240`		`-if (DLGetHead(BackendList)\|\|StartupPID!=0)`
	`2231`	`+if (DLGetHead(BackendList)\|\|StartupPID!=0\|\|AutoVacPID!=0)`
`2241`	`2232`	`gotoreaper_done;`
`2242`	`2233`	`/* Start the bgwriter if not running */`
`2243`	`2234`	`if (BgWriterPID==0)`
`@@ -2250,13 +2241,7 @@ reaper(SIGNAL_ARGS)`
`2250`	`2241`	`signal_child(PgArchPID,SIGQUIT);`
`2251`	`2242`	`/* Tell pgstat to shut down too; nothing left for it to do */`
`2252`	`2243`	`if (PgStatPID!=0)`
`2253`		`-{`
`2254`	`2244`	`signal_child(PgStatPID,SIGQUIT);`
`2255`		`-allow_immediate_pgstat_restart();`
`2256`		`-}`
`2257`		`-/* Tell autovac launcher to shut down too */`
`2258`		`-if (AutoVacPID!=0)`
`2259`		`-signal_child(AutoVacPID,SIGTERM);`
`2260`	`2245`	`}`
`2261`	`2246`
`2262`	`2247`	`reaper_done:`

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!

Commit421d502

File tree

1 file changed

1 file changed

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

0 commit comments