diff options
| author | Heikki Linnakangas | 2023-12-04 13:34:37 +0000 |
|---|---|---|
| committer | Heikki Linnakangas | 2023-12-04 13:34:37 +0000 |
| commit | e7c6efe305afff030b50fe6f792af48deff5cf3e (patch) | |
| tree | 02684fd814d26aa074e3557e610cf445d9f31136 | |
| parent | a3f76a3f7e3a670728e2e2bed45499c11acb2936 (diff) | |
Remove now-unnecessary Autovacuum[Launcher|Worker]IAm functions
After commit fd5e8b440d, InitProcess() is called later in the
EXEC_BACKEND startup sequence, so it's enough to set the
am_autovacuum_[launcher|worker] variables at the same place as in the
!EXEC_BACKEND case.
| -rw-r--r-- | src/backend/postmaster/autovacuum.c | 18 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 6 | ||||
| -rw-r--r-- | src/include/postmaster/autovacuum.h | 2 |
3 files changed, 0 insertions, 26 deletions
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 2f54485c217..3e037248d61 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -386,15 +386,6 @@ avlauncher_forkexec(void) return postmaster_forkexec(ac, av); } - -/* - * We need this set from the outside, before InitProcess is called - */ -void -AutovacuumLauncherIAm(void) -{ - am_autovacuum_launcher = true; -} #endif /* @@ -1453,15 +1444,6 @@ avworker_forkexec(void) return postmaster_forkexec(ac, av); } - -/* - * We need this set from the outside, before InitProcess is called - */ -void -AutovacuumWorkerIAm(void) -{ - am_autovacuum_worker = true; -} #endif /* diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 49cbd8cd05f..ae31d66930d 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -4842,12 +4842,6 @@ SubPostmasterMain(int argc, char *argv[]) else PGSharedMemoryNoReAttach(); - /* autovacuum needs this set before calling InitProcess */ - if (strcmp(argv[1], "--forkavlauncher") == 0) - AutovacuumLauncherIAm(); - if (strcmp(argv[1], "--forkavworker") == 0) - AutovacuumWorkerIAm(); - /* Read in remaining GUC variables */ read_nondefault_variables(); diff --git a/src/include/postmaster/autovacuum.h b/src/include/postmaster/autovacuum.h index b553e858ad4..c9ef31ae66a 100644 --- a/src/include/postmaster/autovacuum.h +++ b/src/include/postmaster/autovacuum.h @@ -66,8 +66,6 @@ extern void AutoVacWorkerFailed(void); #ifdef EXEC_BACKEND extern void AutoVacLauncherMain(int argc, char *argv[]) pg_attribute_noreturn(); extern void AutoVacWorkerMain(int argc, char *argv[]) pg_attribute_noreturn(); -extern void AutovacuumWorkerIAm(void); -extern void AutovacuumLauncherIAm(void); #endif extern bool AutoVacuumRequestWork(AutoVacuumWorkItemType type, |