Again move function where we set effective_cache_size's default

bmomjian · bmomjian · commit 6b82f78ff95d · 2013-10-08T23:12:45.000-04:00
diff --git 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
@@ -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();
 

Original file line number	Diff line number	Diff line change
`@@ -778,8 +778,6 @@ PostmasterMain(int argc, char *argv[])`
`778`	`778`	`ExitPostmaster(1);`
`779`	`779`	`}`
`780`	`780`
`781`		`- set_default_effective_cache_size();`
`782`		`-`
`783`	`781`	`/*`
`784`	`782`	`* Locate the proper configuration files and data directory, and read`
`785`	`783`	`* postgresql.conf for the first time.`
`@@ -797,6 +795,8 @@ PostmasterMain(int argc, char *argv[])`
`797`	`795`	`ExitPostmaster(0);`
`798`	`796`	`}`
`799`	`797`
	`798`	`+ set_default_effective_cache_size();`
	`799`	`+`
`800`	`800`	`/* Verify that DataDir looks reasonable */`
`801`	`801`	`checkDataDir();`
`802`	`802`