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.

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 2f54485c217d71194cd98a0d2cca4f5dcc800380..3e037248d61a2128249bddad357dc97174fa672b 100644 (file)
--- 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 49cbd8cd05fce67fc19da1ba0504f35e0a664ff6..ae31d66930d9d4178b7114dbae2b1dd69766720e 100644 (file)
--- 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 b553e858ad4df5db734cdb76a2317b52f771a542..c9ef31ae66ab232aa3ae751a998c9acec84d12fb 100644 (file)
--- 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,