On Thu, Aug 7, 2014 at 12:36 PM, Amit Kapila <amit.kapil...@gmail.com> wrote:
> On Wed, Aug 6, 2014 at 1:32 PM, Fujii Masao <masao.fu...@gmail.com> wrote:
>> On Tue, Jul 29, 2014 at 9:26 PM, Amit Kapila <amit.kapil...@gmail.com>
>> wrote:
>> >
>> > The reason is that during startup DataDir is not set by the time server
>> > processes config file due to which we process .auto.conf file in second
>> > pass. I think ideally it should ignore the invalid setting in such a
>> > case
>> > as it does during reload, however currently there is no good way to
>> > process .auto.conf incase DataDir is not set, so we handle it
>> > separately
>> > in second pass.
>>
>> What about picking up only data_directory at the first pass?
>
> I think that will workout and for that I think we might need to add
> few checks during ProcessConfigFile. Do you want to address it
> during parsing of config file or during setting of values?
I prefer "during paring". The attached patch does that. In this patch,
the first call of ProcessConfigFile() picks up only data_directory. One
concern of this patch is that the logic is a bit ugly. Do you have any
other better idea?
Regards,
--
Fujii Masao
*** a/src/backend/utils/misc/guc-file.l
--- b/src/backend/utils/misc/guc-file.l
***************
*** 648,653 **** ParseConfigFp(FILE *fp, const char *config_file, int depth, int elevel,
--- 648,672 ----
else
{
/*
+ * Pick up only the data_directory if DataDir is not set, which
+ * means that the configuration file is read for the first time and
+ * PG_AUTOCONF_FILENAME file cannot be read yet. In this case,
+ * we should not pick up all the settings except the data_directory
+ * from postgresql.conf yet because they might be overwritten
+ * with the settings in PG_AUTOCONF_FILENAME file which will be
+ * read later. OTOH, since it's ensured that data_directory doesn't
+ * exist in PG_AUTOCONF_FILENAME file, it will never be overwritten
+ * later. Now only the data_directory needs to be picked up to
+ * read PG_AUTOCONF_FILENAME file later.
+ */
+ if (DataDir == NULL && strcmp(opt_name, "data_directory") != 0)
+ {
+ if (token == 0)
+ break;
+ continue;
+ }
+
+ /*
* ordinary variable, append to list. For multiple items of
* same parameter, retain only which comes later.
*/
*** a/src/backend/utils/misc/guc.c
--- b/src/backend/utils/misc/guc.c
***************
*** 4342,4347 **** SelectConfigFiles(const char *userDoption, const char *progname)
--- 4342,4354 ----
return false;
}
+ /*
+ * Read the configuration file for the first time. This time only
+ * data_directory parameter is picked up to determine the data directory
+ * so that we can read PG_AUTOCONF_FILENAME file next time. Then don't
+ * forget to read the configuration file again later to pick up all the
+ * parameters.
+ */
ProcessConfigFile(PGC_POSTMASTER);
/*
--
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers
