diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c index 9a925a10cd..928754b51c 100644 --- a/src/backend/postmaster/autovacuum.c +++ b/src/backend/postmaster/autovacuum.c @@ -380,7 +380,7 @@ AutoVacLauncherMain(char *startup_data, size_t startup_data_len) if (PostAuthDelay) pg_usleep(PostAuthDelay * 1000000L); - SetProcessingMode(InitProcessing); + Assert(GetProcessingMode() == InitProcessing); /* * Set up signal handlers. We operate on databases much like a regular @@ -1373,7 +1373,7 @@ AutoVacWorkerMain(char *startup_data, size_t startup_data_len) MyBackendType = B_AUTOVAC_WORKER; init_ps_display(NULL); - SetProcessingMode(InitProcessing); + Assert(GetProcessingMode() == InitProcessing); /* * Set up signal handlers. We operate on databases much like a regular diff --git a/src/backend/postmaster/auxprocess.c b/src/backend/postmaster/auxprocess.c index 78f4263eeb..b21eae7136 100644 --- a/src/backend/postmaster/auxprocess.c +++ b/src/backend/postmaster/auxprocess.c @@ -54,7 +54,8 @@ AuxiliaryProcessMainCommon(void) init_ps_display(NULL); - SetProcessingMode(BootstrapProcessing); + Assert(GetProcessingMode() == InitProcessing); + IgnoreSystemIndexes = true; /* diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c index 13dc2cf064..77707bb384 100644 --- a/src/backend/postmaster/bgworker.c +++ b/src/backend/postmaster/bgworker.c @@ -746,7 +746,7 @@ BackgroundWorkerMain(char *startup_data, size_t startup_data_len) MyBackendType = B_BG_WORKER; init_ps_display(worker->bgw_name); - SetProcessingMode(InitProcessing); + Assert(GetProcessingMode() == InitProcessing); /* Apply PostAuthDelay */ if (PostAuthDelay > 0) diff --git a/src/backend/replication/logical/slotsync.c b/src/backend/replication/logical/slotsync.c index e7738f2ea6..fe2f07cf44 100644 --- a/src/backend/replication/logical/slotsync.c +++ b/src/backend/replication/logical/slotsync.c @@ -1342,7 +1342,7 @@ ReplSlotSyncWorkerMain(char *startup_data, size_t startup_data_len) init_ps_display(NULL); - SetProcessingMode(InitProcessing); + Assert(GetProcessingMode() == InitProcessing); /* * Create a per-backend PGPROC struct in shared memory. We must do this diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c index adf71c6902..e39c6804a7 100644 --- a/src/backend/tcop/postgres.c +++ b/src/backend/tcop/postgres.c @@ -4161,7 +4161,7 @@ PostgresMain(const char *dbname, const char *username) Assert(dbname != NULL); Assert(username != NULL); - SetProcessingMode(InitProcessing); + Assert(GetProcessingMode() == InitProcessing); /* * Set up signal handlers. (InitPostmasterChild or InitStandaloneProcess