Again move function where we set effective_cache_size's default

diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index 53c55a36948a6fc28fd3362466ff20fbe6cc49e0..08687f4ff5514d89626b1dcd823c0900ad205824 100644 (file)
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -312,8 +312,6 @@ AuxiliaryProcessMain(int argc, char *argv[])
                proc_exit(1);
        }
 
-       set_default_effective_cache_size();
-       
        /*
         * Identify myself via ps
         */
@@ -352,6 +350,8 @@ AuxiliaryProcessMain(int argc, char *argv[])
                        proc_exit(1);
        }
 
+       set_default_effective_cache_size();
+       
        /* Validate we have been given a reasonable-looking DataDir */
        Assert(DataDir);
        ValidatePgVersion(DataDir);

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 73babdaf5ffec3aba6e4db2b85346864fe6861d0..e9bf121f542536ef058eac17303543d1ab4610c7 100644 (file)
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -778,8 +778,6 @@ PostmasterMain(int argc, char *argv[])
                ExitPostmaster(1);
        }
 
-       set_default_effective_cache_size();
-
        /*
         * Locate the proper configuration files and data directory, and read
         * postgresql.conf for the first time.
@@ -797,6 +795,8 @@ PostmasterMain(int argc, char *argv[])
                ExitPostmaster(0);
        }
 
+       set_default_effective_cache_size();
+
        /* Verify that DataDir looks reasonable */
        checkDataDir();