Remove redundant SetProcessingMode(InitProcessing) calls

After several refactoring iterations, auxiliary processes are no
longer initialized from the bootstrapper. Using the InitProcessing
mode for initializing auxiliary processes is more appropriate. Since
the global variable Mode is initialized to InitProcessing, we can just
remove the redundant calls of SetProcessingMode(InitProcessing).

Author: Xing Guo <higuoxing@gmail.com>
Discussion: https://www.postgresql.org/message-id/CACpMh%2BDBHVT4xPGimzvex%3DwMdMLQEu9PYhT%2BkwwD2x2nu9dU_Q%40mail.gmail.com

diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 9a925a10cdc7df3b77949b6197e83c0c46de28b8..928754b51c4e572a0f0eed95af9c4baaa54c747d 100644 (file)
--- 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 78f4263eeb1291266701ce8be02a59abe002b68d..b21eae71368339f21e7062f2c7509f376704d955 100644 (file)
--- 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 13dc2cf064e10323c155b2b273de579ad9408da2..77707bb38477757be11e3a240e833c66f9a66394 100644 (file)
--- 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 e7738f2ea63026b39e1de4f49c391173e3a344f8..fe2f07cf44957e71a2205701414b4eace02a95ce 100644 (file)
--- 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 adf71c6902667f69669ee7539c0732c43438bd27..e39c6804a73098c9fcb6877171fd3513dd123b62 100644 (file)
--- 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