diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/autovacuum.c | 4 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 22 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 00d58f0bda3..49b3ffa38cc 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -55,7 +55,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.101 2009/08/12 20:53:30 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/autovacuum.c,v 1.102 2009/08/24 17:23:02 alvherre Exp $ * *------------------------------------------------------------------------- */ @@ -653,7 +653,7 @@ AutoVacLauncherMain(int argc, char *argv[]) * of a worker will continue to fail in the same way. */ AutoVacuumShmem->av_signal[AutoVacForkFailed] = false; - pg_usleep(100000L); /* 100ms */ + pg_usleep(1000000L); /* 1s */ SendPostmasterSignal(PMSIGNAL_START_AUTOVAC_WORKER); continue; } diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index e21d8e885b2..59a614aae2b 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -37,7 +37,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.587 2009/08/07 05:58:55 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.588 2009/08/24 17:23:02 alvherre Exp $ * * NOTES * @@ -290,6 +290,8 @@ bool redirection_done = false; /* stderr redirected for syslogger? */ /* received START_AUTOVAC_LAUNCHER signal */ static volatile sig_atomic_t start_autovac_launcher = false; +/* the launcher needs to be signalled to communicate some condition */ +static volatile bool avlauncher_needs_signal = false; /* * State for assigning random salts and cancel keys. @@ -1391,6 +1393,14 @@ ServerLoop(void) if (PgStatPID == 0 && pmState == PM_RUN) PgStatPID = pgstat_start(); + /* If we need to signal the autovacuum launcher, do so now */ + if (avlauncher_needs_signal) + { + avlauncher_needs_signal = false; + if (AutoVacPID != 0) + kill(AutoVacPID, SIGUSR1); + } + /* * Touch the socket and lock file every 58 minutes, to ensure that * they are not removed by overzealous /tmp-cleaning tasks. We assume @@ -3014,6 +3024,7 @@ BackendStartup(Port *port) /* in parent, fork failed */ int save_errno = errno; + (void) ReleasePostmasterChildSlot(bn->child_slot); free(bn); errno = save_errno; ereport(LOG, @@ -4343,6 +4354,7 @@ StartAutovacuumWorker(void) * fork failed, fall through to report -- actual error message was * logged by StartAutoVacWorker */ + (void) ReleasePostmasterChildSlot(bn->child_slot); free(bn); } else @@ -4354,12 +4366,16 @@ StartAutovacuumWorker(void) /* * Report the failure to the launcher, if it's running. (If it's not, we * might not even be connected to shared memory, so don't try to call - * AutoVacWorkerFailed.) + * AutoVacWorkerFailed.) Note that we also need to signal it so that it + * responds to the condition, but we don't do that here, instead waiting + * for ServerLoop to do it. This way we avoid a ping-pong signalling in + * quick succession between the autovac launcher and postmaster in case + * things get ugly. */ if (AutoVacPID != 0) { AutoVacWorkerFailed(); - kill(AutoVacPID, SIGUSR1); + avlauncher_needs_signal = true; } } |