Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7a5a59d

Browse files
Set recovery_config_directory for EXEC_BACKEND.
Remove comment questioning whether this is necessary for DataDir. From buildfarm failures on Windows.
1 parent 7800a71 commit 7a5a59d

File tree

1 file changed

+6
-3
lines changed
  • src/backend/utils/misc

1 file changed

+6
-3
lines changed

src/backend/utils/misc/guc.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4187,9 +4187,7 @@ SelectConfigFiles(const char *userDoption, const char *progname)
41874187
* Reflect the final DataDir value back into the data_directory GUC var.
41884188
* (If you are wondering why we don't just make them a single variable,
41894189
* it's because the EXEC_BACKEND case needs DataDir to be transmitted to
4190-
* child backends specially. XXX is that still true? Given that we now
4191-
* chdir to DataDir, EXEC_BACKEND can read the config file without knowing
4192-
* DataDir in advance.)
4190+
* child backends specially.
41934191
*/
41944192
SetConfigOption("data_directory", DataDir, PGC_POSTMASTER, PGC_S_OVERRIDE);
41954193

@@ -4205,6 +4203,11 @@ SelectConfigFiles(const char *userDoption, const char *progname)
42054203
else
42064204
SetRecoveryConfDir(DataDir);
42074205

4206+
/*
4207+
* Reflect the final RecoveryConfDir value back into the GUC var, as above.
4208+
*/
4209+
SetConfigOption("recovery_config_directory", RecoveryConfDir, PGC_POSTMASTER, PGC_S_OVERRIDE);
4210+
42084211
/*
42094212
* If timezone_abbreviations wasn't set in the configuration file, install
42104213
* the default value. We do it this way because we can't safely install a

0 commit comments

Comments
 (0)