]> granicus.if.org Git - postgresql/commit
Change first call of ProcessConfigFile so as to process only data_directory.
authorFujii Masao <fujii@postgresql.org>
Tue, 12 Aug 2014 07:50:09 +0000 (16:50 +0900)
committerFujii Masao <fujii@postgresql.org>
Tue, 12 Aug 2014 07:50:09 +0000 (16:50 +0900)
commit3e3f65973a3c94a699a1659254b89c4f77f0a6a7
tree6eea152dbbbd77cb78a2cf1f5386205c150f5eb2
parente15c4ab5fb0de2cab393ed4be2136e1832746412
Change first call of ProcessConfigFile so as to process only data_directory.

When both postgresql.conf and postgresql.auto.conf have their own entry of
the same parameter, PostgreSQL uses the entry in postgresql.auto.conf because
it appears last in the configuration scan. IOW, the other entries which appear
earlier are ignored. But, previously, ProcessConfigFile() detected the invalid
settings of even those unused entries and emitted the error messages
complaining about them, at postmaster startup. Complaining about the entries
to ignore is basically useless.

This problem happened because ProcessConfigFile() was called twice at
postmaster startup and the first call read only postgresql.conf. That is, the
first call could check the entry which might be ignored eventually by
the second call which read both postgresql.conf and postgresql.auto.conf.
To work around the problem, this commit changes ProcessConfigFile so that
its first call processes only data_directory and the second one does all the
entries. It's OK to process data_directory in the first call because it's
ensured that data_directory doesn't exist in postgresql.auto.conf.

Back-patch to 9.4 where postgresql.auto.conf was added.

Patch by me. Review by Amit Kapila
src/backend/utils/misc/guc-file.l
src/backend/utils/misc/guc.c